修改页面bug,

main
jinna 2 years ago
parent d11c4348b8
commit 1d3a4219db
  1. 28
      src/const/limsConfig/equipmentManage.js
  2. 1
      src/styles/sidebar.scss
  3. 2
      src/views/capital/components/outStatic.vue
  4. 1
      src/views/capital/productstoreList.vue
  5. 28
      src/views/repair/proposer.vue
  6. 8
      src/views/repair/repairAppyDetail.vue
  7. 3
      src/views/wel/index.vue

@ -45,20 +45,20 @@ export const tableOption = {
overHidden: true, overHidden: true,
rules: [{ required: true, message: "请输入仪器/设备名称" }], rules: [{ required: true, message: "请输入仪器/设备名称" }],
}, },
{ // {
type: "select", // type: "select",
label: "仪器设备类型", // label: "仪器设备类型",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument", // dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument",
props: { // props: {
label: "dictValue", // label: "dictValue",
value: "dictKey", // value: "dictKey",
}, // },
span: 8, // span: 8,
display: true, // display: true,
prop: "type", // prop: "type",
align: "left", // align: "left",
overHidden: true, // overHidden: true,
}, // },
{ {
type: "input", type: "input",
span: 8, span: 8,

@ -41,6 +41,7 @@
box-shadow: 2px 0 6px rgba(0,21,41,.35); box-shadow: 2px 0 6px rgba(0,21,41,.35);
.el-scrollbar__wrap { .el-scrollbar__wrap {
overflow-x: hidden; overflow-x: hidden;
height: 93% !important;
} }
&--tip{ &--tip{
width:90%; width:90%;

@ -113,7 +113,7 @@
</div> </div>
</div> </div>
<div class="export_box"> <div class="export_box">
<el-button class="export_btn" @click="exportDetail">导出</el-button> <!-- <el-button class="export_btn" @click="exportDetail">导出</el-button> -->
</div> </div>
</el-dialog> </el-dialog>
</div> </div>

@ -554,6 +554,7 @@
<!-- <span>申领数:&emsp;&emsp;&emsp;</span> --> <!-- <span>申领数:&emsp;&emsp;&emsp;</span> -->
<el-input <el-input
v-model="item.applyNum" v-model="item.applyNum"
readonly
placeholder="请输入申领数" placeholder="请输入申领数"
type="text" type="text"
style="width: 240px; height: 40px" style="width: 240px; height: 40px"

@ -211,20 +211,20 @@ export default {
}, },
], ],
}, },
{ // {
type: "select", // type: "select",
label: "设备类型", // label: "",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument", // dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument",
props: { // props: {
label: "dictValue", // label: "dictValue",
value: "dictKey", // value: "dictKey",
}, // },
span: 8, // span: 8,
display: true, // display: true,
prop: "type", // prop: "type",
align: "left", // align: "left",
overHidden: true, // overHidden: true,
}, // },
{ {
type: "select", type: "select",
label: "申请维修部门", label: "申请维修部门",

@ -77,11 +77,11 @@
<el-input v-model="form.name" readonly></el-input> <el-input v-model="form.name" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="仪器设备类型"> <el-form-item label="仪器设备类型">
<el-input v-model="form.type" readonly></el-input> <el-input v-model="form.type" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制造商"> <el-form-item label="制造商">
<el-input v-model="form.manufacturer" readonly></el-input> <el-input v-model="form.manufacturer" readonly></el-input>
@ -92,8 +92,6 @@
<el-input v-model="form.model" readonly></el-input> <el-input v-model="form.model" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="出场日期"> <el-form-item label="出场日期">
<el-date-picker <el-date-picker
@ -105,6 +103,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="启用日期"> <el-form-item label="启用日期">
<el-date-picker <el-date-picker

@ -258,7 +258,7 @@ export default {
{ index: 15, label: '接收货品', clickHanderCode: 43, mouseoverCode: 10, mouseleaveCode: 10, shouldRoleId: false,imgSrc: indexicon.Receivinggoods, }, { index: 15, label: '接收货品', clickHanderCode: 43, mouseoverCode: 10, mouseleaveCode: 10, shouldRoleId: false,imgSrc: indexicon.Receivinggoods, },
{ index: 16, label: '申领出库', clickHanderCode: 45, mouseoverCode: 11, mouseleaveCode: 11, shouldRoleId: false,imgSrc: indexicon.Claimoutofthewarehouse, }, { index: 16, label: '申领出库', clickHanderCode: 45, mouseoverCode: 11, mouseleaveCode: 11, shouldRoleId: false,imgSrc: indexicon.Claimoutofthewarehouse, },
{ index: 17, label: '供应商 ', clickHanderCode: 46, mouseoverCode: 9, mouseleaveCode: 9, shouldRoleId: false,imgSrc: indexicon.vendor, }, { index: 17, label: '供应商 ', clickHanderCode: 46, mouseoverCode: 9, mouseleaveCode: 9, shouldRoleId: false,imgSrc: indexicon.vendor, },
{ index: 18, label: '物品申领', clickHanderCode: 42, mouseoverCode: 2, mouseleaveCode: 2, shouldRoleId: false,imgSrc: indexicon.wupinshenling, } // { index: 18, label: '', clickHanderCode: 42, mouseoverCode: 2, mouseleaveCode: 2, shouldRoleId: false,imgSrc: indexicon.wupinshenling, }
] ]
}; };
}, },
@ -567,6 +567,7 @@ export default {
// //
// //
const res1 = await getEveryStatusAndCount({ deptId: this.userInfo.deptId ,roleId:this.userInfo.roleId }) const res1 = await getEveryStatusAndCount({ deptId: this.userInfo.deptId ,roleId:this.userInfo.roleId })
console.log('res =====>',res1)
let result1 = res1.data.data; let result1 = res1.data.data;
this.cardInfoList[0].judjeVariable = result1.djy // this.cardInfoList[0].judjeVariable = result1.djy //
this.cardInfoList[1].judjeVariable = result1.djh // this.cardInfoList[1].judjeVariable = result1.djh //

Loading…
Cancel
Save