Commit a94938aa by wangweidong

土工试验Lims

parent 380d3e38
...@@ -121,6 +121,7 @@ export default { ...@@ -121,6 +121,7 @@ export default {
{ title: '现场编号', key: 'siteNo', width: 100 }, { title: '现场编号', key: 'siteNo', width: 100 },
{ title: '接收人', key: 'receiver', width: 120 }, { title: '接收人', key: 'receiver', width: 120 },
{ title: '接收时间', key: 'receiveTime', width: 140, date: true }, { title: '接收时间', key: 'receiveTime', width: 140, date: true },
{ title: '留存有效期', key: 'keepLimitTime', width: 140, date: true },
{ title: '收样存储位置', key: 'receiveLocation', width: 140 }, { title: '收样存储位置', key: 'receiveLocation', width: 140 },
{ title: '土质描述', key: 'sampleDescribe', width: 185 }, { title: '土质描述', key: 'sampleDescribe', width: 185 },
{ title: '样品包装类型', key: 'samplePack', width: 120 } { title: '样品包装类型', key: 'samplePack', width: 120 }
...@@ -143,25 +144,7 @@ export default { ...@@ -143,25 +144,7 @@ export default {
searchOpen: true, searchOpen: true,
getPage: {}, getPage: {},
// 选中的内容 // 选中的内容
selectIds: [], selectIds: []
statusList: [
{ value: 0, name: '现行' },
{ value: 1, name: '即将实施' },
{ value: 2, name: '部分被代替' },
{ value: 3, name: '被代替' },
{ value: 4, name: '作废' }
],
classifyList: [
{ value: 0, name: '判定标准' },
{ value: 1, name: '检测依据' },
{ value: 2, name: '其他' }
],
typeList: [
{ value: 0, name: '国家标准' },
{ value: 1, name: '地方标准' },
{ value: 2, name: '行业标准' },
{ value: 3, name: '企业标准' }
]
} }
}, },
computed: { computed: {
......
...@@ -11,6 +11,11 @@ ...@@ -11,6 +11,11 @@
</el-option> </el-option>
</el-select> </el-select>
</Form-item> </Form-item>
<Form-item label="留存有效期:" prop="keepLimitTime" style="width: 100%">
<Date-picker v-model="formObj.keepLimitTime" @on-change="_ctimeChange" type="date" split-panels
placeholder="请选择留存有效期" name="keepLimitTime"></Date-picker>
</Form-item>
</Form> </Form>
</div> </div>
<div slot="footer"> <div slot="footer">
...@@ -35,8 +40,9 @@ export default { ...@@ -35,8 +40,9 @@ export default {
formId: '', formId: '',
modalTitle: '留存位置选择', modalTitle: '留存位置选择',
formObj: { formObj: {
receiveLocation: '', receiveLocation: undefined,
locationId: '' keepLimitTime: undefined,
locationId: undefined
}, },
ruleValidate: {}, ruleValidate: {},
showEditModal: false, showEditModal: false,
...@@ -72,6 +78,9 @@ export default { ...@@ -72,6 +78,9 @@ export default {
this.$emit('on-result-change') this.$emit('on-result-change')
this._hideLoading() this._hideLoading()
}, },
_ctimeChange(data) {
this.formObj.keepLimitTime = data
},
_ok() { _ok() {
this.$refs.formObj.validate(valid => { this.$refs.formObj.validate(valid => {
if (valid) { if (valid) {
...@@ -102,6 +111,7 @@ export default { ...@@ -102,6 +111,7 @@ export default {
}, },
_open(ids) { _open(ids) {
this.formObj.receiveLocation = '' this.formObj.receiveLocation = ''
this.formObj.keepLimitTime = undefined
this.formObj.locationId = '' this.formObj.locationId = ''
this._getLocation() this._getLocation()
this.ids = ids this.ids = ids
......
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