Commit cb4f4e04 authored by dingyoujian's avatar dingyoujian

调整

parent 53736fcc
......@@ -15,7 +15,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="制造" ref="productor" prop="productor">
<el-form-item label="制造厂家" ref="productor" prop="productor">
<el-input :readonly="readonly" v-model="form.productor" ></el-input>
</el-form-item>
</el-col>
......@@ -25,7 +25,7 @@
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="出厂编号" ref="serialno" prop="serialno">
<el-form-item label="登记证编号" ref="serialno" prop="serialno">
<el-input :readonly="readonly" v-model="form.serialno" ></el-input>
</el-form-item>
</el-col> -->
......@@ -109,11 +109,11 @@
flid:'',
//名称
name:'',
//制造
//制造厂家
productor:'',
//型号
model:'',
//出厂编号
//登记证编号
serialno:'',
//计量单位
jldw:'',
......@@ -129,7 +129,7 @@
yt:'',
//数量
sl:'',
//出厂日期
//制造日期
ccrq:new Date().getTime(),
//工作级别
gzjb:'',
......
......@@ -7,29 +7,23 @@
<el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">档案编号:</span>
<el-input v-model="queryParams.dabh"></el-input>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">设备名称:</span>
<span class="search-span">设备信息:</span>
<el-input v-model="queryParams.sbxx"></el-input>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">是否已入档:</span>
<el-select v-model="queryParams.doc" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-col>
<!--<el-col :span="6" class="search-col">-->
<!--<div class="search-item">-->
<!--<span class="search-span">是否已入档:</span>-->
<!--<el-select v-model="queryParams.doc" placeholder="请选择">-->
<!--<el-option-->
<!--v-for="item in options"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value">-->
<!--</el-option>-->
<!--</el-select>-->
<!--</div>-->
<!--</el-col>-->
</el-row>
</div>
......@@ -100,26 +94,28 @@
},
/* 表格标题对应参数*/
tableTitle: [
{label: "档案编号", prop: "dabh", fieldType: "ftString",width:100},
{label: "设备编号", prop: "code", fieldType: "ftString",width:140},
//gsid下拉
{label: "公司", prop: "gsName", fieldType: "ftString",width:96},
//flid,下拉, aqgl/sbgl/sbfl/query
{label: "设备分类", prop: "sbflName", fieldType: "ftString",width:96},
{label: "设备编号", prop: "dabh", fieldType: "ftString",width:100},
{label: "设备代码", prop: "code", fieldType: "ftString",width:140},
{label: "设备名称", prop: "name", fieldType: "ftString",width:160},
{label: "使用地点", prop: "sydd", fieldType: "ftString",width:300},
// {label: "系统分类", prop: "xtflName", fieldType: "ftString",width:48},
// {label: "设备分类", prop: "sbflName", fieldType: "ftString",width:96},
{label: "制造商", prop: "productor", fieldType: "ftString",width:300},
{label: "型号", prop: "model", fieldType: "ftString",width:300},
{label: "出厂编号", prop: "serialno", fieldType: "ftString",width:300},
{label: "计量单位", prop: "jldw", fieldType: "ftString",width:120},
{label: "制造厂家", prop: "productor", fieldType: "ftString",width:300},
{label: "登记证编号", prop: "serialno", fieldType: "ftString",width:300},
{label: "制造日期", prop: "ccrq", fieldType: "ftDateTime"},
// {label: "计量单位", prop: "jldw", fieldType: "ftString",width:120},
{label: "启用日期", prop: "qyrq", fieldType: "ftDateTime"},
{label: "检验日期", prop: "scjyrq", fieldType: "ftDateTime"},
{label: "下次检验日期", prop: "xcjyrq", fieldType: "ftDateTime"},
{label: "检验周期", prop: "jyzq", fieldType: "ftString"},
/* {label: "停用日期", prop: "tyrq", fieldType: "ftDateTime"}, */
{label: "使用状态", prop: "tybzName", fieldType: "ftString",width:80},
{label: "使用地点", prop: "sydd", fieldType: "ftString",width:300},
{label: "用途", prop: "yt", fieldType: "ftString",width:300},
{label: "数量", prop: "sl", fieldType: "int"},
{label: "出厂日期", prop: "ccrq", fieldType: "ftDateTime"},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "是否已入档", prop: "doc", fieldType: "ftString",width:160,show:false},
{label: "是否已入档", prop: "docName", fieldType: "ftString",width:160}
{label: "使用状态", prop: "syzt", fieldType: "ftString",width:80},
{label: "备注", prop: "bz", fieldType: "ftString",width:300}
]
}
},
......
......@@ -29,7 +29,7 @@
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item label="制造" ref="productor" prop="productor">
<el-form-item label="制造厂家" ref="productor" prop="productor">
<el-input :readonly="readonly" v-model="form.productor" ></el-input>
</el-form-item>
</el-col>
......@@ -39,7 +39,7 @@
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item label="出厂编号" ref="serialno" prop="serialno">
<el-form-item label="登记证编号" ref="serialno" prop="serialno">
<el-input :readonly="readonly" v-model="form.serialno" ></el-input>
</el-form-item>
</el-col>
......@@ -83,7 +83,7 @@
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item label="出厂日期" ref="ccrq" prop="ccrq">
<el-form-item label="制造日期" ref="ccrq" prop="ccrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.ccrq" placeholder="选择日期">
</el-date-picker>
......@@ -458,11 +458,11 @@
flid:'',
//名称
name:'',
//制造
//制造厂家
productor:'',
//型号
model:'',
//出厂编号
//登记证编号
serialno:'',
//计量单位
jldw:'',
......@@ -478,7 +478,7 @@
yt:'',
//数量
sl:'',
//出厂日期
//制造日期
ccrq:new Date().getTime(),
//系统分类
xtfl:'',
......
......@@ -79,9 +79,9 @@
{label: "系统分类", prop: "xtflName", fieldType: "ftString",width:48},
{label: "设备分类", prop: "sbflName", fieldType: "ftString",width:96},
{label: "名称", prop: "name", fieldType: "ftString",width:300},
{label: "制造", prop: "productor", fieldType: "ftString",width:300},
{label: "制造厂家", prop: "productor", fieldType: "ftString",width:300},
{label: "型号", prop: "model", fieldType: "ftString",width:300},
{label: "出厂编号", prop: "serialno", fieldType: "ftString",width:300},
{label: "登记证编号", prop: "serialno", fieldType: "ftString",width:300},
{label: "计量单位", prop: "jldw", fieldType: "ftString",width:120},
{label: "启用日期", prop: "qyrq", fieldType: "ftDateTime"},
/* {label: "停用日期", prop: "tyrq", fieldType: "ftDateTime"}, */
......@@ -89,7 +89,7 @@
{label: "使用地点", prop: "sydd", fieldType: "ftString",width:300},
{label: "用途", prop: "yt", fieldType: "ftString",width:300},
{label: "数量", prop: "sl", fieldType: "int"},
{label: "出厂日期", prop: "ccrq", fieldType: "ftDateTime"},
{label: "制造日期", prop: "ccrq", fieldType: "ftDateTime"},
{label: "系统分类", prop: "xtfl", fieldType: "ftString",width:48},
{label: "工作级别", prop: "gzjb", fieldType: "ftString",width:180},
{label: "跨度", prop: "kd", fieldType: "ftString",width:180},
......
......@@ -46,7 +46,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="制造" ref="productor" prop="productor">
<el-form-item label="制造厂家" ref="productor" prop="productor">
<el-input :readonly="readonly" v-model="form.productor" ></el-input>
</el-form-item>
</el-col>
......@@ -79,7 +79,7 @@
-->
<!-- <el-col :span="12">
<el-form-item label="出厂编号" ref="serialno" prop="serialno">
<el-form-item label="登记证编号" ref="serialno" prop="serialno">
<el-input :readonly="readonly" v-model="form.serialno" ></el-input>
</el-form-item>
</el-col> -->
......@@ -106,7 +106,7 @@
-->
<!-- <el-col :span="12">
<el-form-item label="出厂日期" ref="ccrq" prop="ccrq">
<el-form-item label="制造日期" ref="ccrq" prop="ccrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.ccrq" placeholder="选择日期">
</el-date-picker>
......@@ -467,11 +467,11 @@
flid:'',
//名称
name:'',
//制造
//制造厂家
productor:'',
//型号
model:'',
//出厂编号
//登记证编号
serialno:'',
//计量单位
jldw:'',
......@@ -487,7 +487,7 @@
yt:'',
//数量
sl:'',
//出厂日期
//制造日期
ccrq:new Date().getTime(),
//系统分类
xtfl:'2',
......
......@@ -129,15 +129,15 @@
{label: "仪器名称", prop: "name", fieldType: "ftString",width:240},
{label: "型号", prop: "model", fieldType: "ftString",width:100},
{label: "计量单位", prop: "jldw", fieldType: "ftString",width:120},
{label: "制造", prop: "productor", fieldType: "ftString",width:300},
// {label: "出厂编号", prop: "serialno", fieldType: "ftString",width:300},
{label: "制造厂家", prop: "productor", fieldType: "ftString",width:300},
// {label: "登记证编号", prop: "serialno", fieldType: "ftString",width:300},
{label: "启用日期", prop: "qyrq", fieldType: "ftDateTime"},
/* {label: "停用日期", prop: "tyrq", fieldType: "ftDateTime"}, */
{label: "使用状态", prop: "tybzName", fieldType: "ftString",width:120},
{label: "使用地点", prop: "sydd", fieldType: "ftString",width:300},
// {label: "用途", prop: "yt", fieldType: "ftString",width:300},
{label: "数量", prop: "sl", fieldType: "int"},
// {label: "出厂日期", prop: "ccrq", fieldType: "ftDateTime"},
// {label: "制造日期", prop: "ccrq", fieldType: "ftDateTime"},
// {label: "系统分类", prop: "xtfl", fieldType: "ftString",width:48},
// {label: "工作级别", prop: "gzjb", fieldType: "ftString",width:180},
// {label: "跨度", prop: "kd", fieldType: "ftString",width:180},
......
......@@ -47,7 +47,7 @@
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="制造" ref="productor" prop="productor">
<el-form-item label="制造厂家" ref="productor" prop="productor">
<el-input :readonly="readonly" v-model="form.productor" ></el-input>
</el-form-item>
</el-col>
......@@ -57,7 +57,7 @@
</el-form-item>
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="出厂编号" ref="serialno" prop="serialno">
<el-form-item label="登记证编号" ref="serialno" prop="serialno">
<el-input :readonly="readonly" v-model="form.serialno" ></el-input>
</el-form-item>
</el-col> -->
......@@ -116,7 +116,7 @@
</el-form-item>
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="出厂日期" ref="ccrq" prop="ccrq">
<el-form-item label="制造日期" ref="ccrq" prop="ccrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.ccrq" placeholder="选择日期">
</el-date-picker>
......@@ -464,11 +464,11 @@
flid:'',
//名称
name:'',
//制造
//制造厂家
productor:'',
//型号
model:'',
//出厂编号
//登记证编号
serialno:'',
//计量单位
jldw:'',
......@@ -484,7 +484,7 @@
yt:'',
//数量
sl:'',
//出厂日期
//制造日期
ccrq:new Date().getTime(),
//工作级别
gzjb:'',
......
......@@ -96,9 +96,9 @@
// {label: "系统分类", prop: "xtflName", fieldType: "ftString",width:48},
// {label: "设备分类", prop: "sbflName", fieldType: "ftString",width:96},
{label: "名称", prop: "name", fieldType: "ftString",width:300},
// {label: "制造", prop: "productor", fieldType: "ftString",width:300},
// {label: "制造厂家", prop: "productor", fieldType: "ftString",width:300},
// {label: "型号", prop: "model", fieldType: "ftString",width:300},
// {label: "出厂编号", prop: "serialno", fieldType: "ftString",width:300},
// {label: "登记证编号", prop: "serialno", fieldType: "ftString",width:300},
// {label: "计量单位", prop: "jldw", fieldType: "ftString",width:120},
// {label: "启用日期", prop: "qyrq", fieldType: "ftDateTime"},
/* {label: "停用日期", prop: "tyrq", fieldType: "ftDateTime"}, */
......@@ -106,7 +106,7 @@
// {label: "使用地点", prop: "sydd", fieldType: "ftString",width:300},
{label: "用途", prop: "yt", fieldType: "ftString",width:300},
// {label: "数量", prop: "sl", fieldType: "int"},
// {label: "出厂日期", prop: "ccrq", fieldType: "ftDateTime"},
// {label: "制造日期", prop: "ccrq", fieldType: "ftDateTime"},
// {label: "系统分类", prop: "xtfl", fieldType: "ftString",width:48},
// {label: "工作级别", prop: "gzjb", fieldType: "ftString",width:180},
// {label: "跨度", prop: "kd", fieldType: "ftString",width:180},
......
......@@ -15,7 +15,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="制造" ref="productor" prop="productor">
<el-form-item label="制造厂家" ref="productor" prop="productor">
<el-input :readonly="readonly" v-model="form.productor" ></el-input>
</el-form-item>
</el-col>
......@@ -25,7 +25,7 @@
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="出厂编号" ref="serialno" prop="serialno">
<el-form-item label="登记证编号" ref="serialno" prop="serialno">
<el-input :readonly="readonly" v-model="form.serialno" ></el-input>
</el-form-item>
</el-col> -->
......@@ -109,11 +109,11 @@
flid:'',
//名称
name:'',
//制造
//制造厂家
productor:'',
//型号
model:'',
//出厂编号
//登记证编号
serialno:'',
//计量单位
jldw:'',
......@@ -129,7 +129,7 @@
yt:'',
//数量
sl:'',
//出厂日期
//制造日期
ccrq:new Date().getTime(),
//工作级别
gzjb:'',
......
......@@ -15,7 +15,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="制造" ref="productor" prop="productor">
<el-form-item label="制造厂家" ref="productor" prop="productor">
<el-input :readonly="readonly" v-model="form.productor" ></el-input>
</el-form-item>
</el-col>
......@@ -25,7 +25,7 @@
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="出厂编号" ref="serialno" prop="serialno">
<el-form-item label="登记证编号" ref="serialno" prop="serialno">
<el-input :readonly="readonly" v-model="form.serialno" ></el-input>
</el-form-item>
</el-col> -->
......@@ -109,11 +109,11 @@
flid:'',
//名称
name:'',
//制造
//制造厂家
productor:'',
//型号
model:'',
//出厂编号
//登记证编号
serialno:'',
//计量单位
jldw:'',
......@@ -129,7 +129,7 @@
yt:'',
//数量
sl:'',
//出厂日期
//制造日期
ccrq:new Date().getTime(),
//工作级别
gzjb:'',
......
......@@ -122,9 +122,9 @@
{label: "设备名称", prop: "name", fieldType: "ftString",width:160},
// {label: "系统分类", prop: "xtflName", fieldType: "ftString",width:48},
// {label: "设备分类", prop: "sbflName", fieldType: "ftString",width:96},
{label: "制造", prop: "productor", fieldType: "ftString",width:300},
{label: "制造厂家", prop: "productor", fieldType: "ftString",width:300},
{label: "型号", prop: "model", fieldType: "ftString",width:300},
{label: "出厂编号", prop: "serialno", fieldType: "ftString",width:300},
{label: "登记证编号", prop: "serialno", fieldType: "ftString",width:300},
{label: "计量单位", prop: "jldw", fieldType: "ftString",width:120},
{label: "启用日期", prop: "qyrq", fieldType: "ftDateTime"},
/* {label: "停用日期", prop: "tyrq", fieldType: "ftDateTime"}, */
......@@ -132,7 +132,7 @@
{label: "使用地点", prop: "sydd", fieldType: "ftString",width:300},
{label: "用途", prop: "yt", fieldType: "ftString",width:300},
{label: "数量", prop: "sl", fieldType: "int"},
{label: "出厂日期", prop: "ccrq", fieldType: "ftDateTime"},
{label: "制造日期", prop: "ccrq", fieldType: "ftDateTime"},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "是否已入档", prop: "doc", fieldType: "ftString",width:160,show:false},
{label: "是否已入档", prop: "docName", fieldType: "ftString",width:160}
......
......@@ -24,7 +24,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="制造" ref="productor" prop="productor">
<el-form-item label="制造厂家" ref="productor" prop="productor">
<el-input :readonly="readonly" v-model="form.productor" ></el-input>
</el-form-item>
</el-col>
......@@ -34,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出厂编号" ref="serialno" prop="serialno">
<el-form-item label="登记证编号" ref="serialno" prop="serialno">
<el-input :readonly="readonly" v-model="form.serialno" ></el-input>
</el-form-item>
</el-col>
......@@ -180,7 +180,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出厂日期" ref="ccrq" prop="ccrq">
<el-form-item label="制造日期" ref="ccrq" prop="ccrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" value-format="timestamp"
v-model="form.ccrq" placeholder="选择日期">
</el-date-picker>
......@@ -236,11 +236,11 @@
flid:'',
//名称
name:'',
//制造
//制造厂家
productor:'',
//型号
model:'',
//出厂编号
//登记证编号
serialno:'',
//计量单位
jldw:'',
......@@ -256,7 +256,7 @@
yt:'',
//数量
sl:'',
//出厂日期
//制造日期
ccrq:new Date().getTime(),
//工作级别
gzjb:'',
......
......@@ -133,11 +133,11 @@
{label: "档案编号", prop: "dabh", fieldType: "ftString",width:100},
{label: "设备编号", prop: "code", fieldType: "ftString",width:140},
{label: "设备名称", prop: "name", fieldType: "ftString",width:160},
{label: "制造", prop: "productor", fieldType: "ftString",width:200},
{label: "制造厂家", prop: "productor", fieldType: "ftString",width:200},
{label: "使用状态", prop: "tybzName", fieldType: "ftString",width:80},
{label: "出厂日期", prop: "ccrq", fieldType: "ftDateTime"},
{label: "制造日期", prop: "ccrq", fieldType: "ftDateTime"},
{label: "安装日期", prop: "azrq", fieldType: "ftDateTime"},
{label: "安装地点", prop: "azdd", fieldType: "ftString",width:300},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment