Skip to content

P
patzn-cloud-web-back-soil
Commit 5a54ea60 by lichengming
Options

添加了添加原始记录模板

parent 4a5d105d
Showing with 20 additions and 39 deletions
pages/soil-record-template-manage/SoilRecordTemplate.vue
......@@ -59,8 +59,6 @@ export default {
return {
pageColumns: [
{ title: '原始记录模板名称', key: 'name' },
{ title: '模板类别', key: 'classType' },
{ title: '别名', key: 'alias' },
{ title: '备注', key: 'remark' }
],
formObj: {
......
pages/soil-record-template-manage/SoilRecordTemplateEdit.vue
......@@ -9,20 +9,12 @@
</Spin>
</div>
<div>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="80">
<Form-item label="类别" prop="classType">
<!-- <Input v-model="formObj.classType" @on-keyup="_onKeyUp" name="classType" placeholder="请选择类别" icon="plus-circled"-->
<!-- ></Input>-->
<el-select v-model="formObj.classType" placeholder="请选择类别" size="small" clearable>
<el-option :label="item.value" :value="item.value" v-for="(item,index) in typeList"
:key="index"></el-option>
</el-select>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="95">
<Form-item label="原始记录名称" prop="name">
<Input v-model="formObj.name" @on-keyup="_onKeyUp" name="name" placeholder="请输入原始记录名称"></Input>
</Form-item>
<Form-item label="别名" prop="alias">
<Input v-model="formObj.alias" @on-keyup="_onKeyUp" name="alias" placeholder="请输入别名"></Input>
</Form-item>
<Form-item label="项目代号" prop="remark">
<Input v-model="formObj.remark" @on-keyup="_onKeyUp" name="remark" placeholder="请输入项目代号"></Input>
<Form-item label="备注" prop="remark">
<Input v-model="formObj.remark" @on-keyup="_onKeyUp" name="remark" placeholder="请输入备注"></Input>
</Form-item>
</Form>
</div>
......@@ -57,8 +49,7 @@
import global from '../../api/config'
const defVal = {
alias: '',
classType: '',
name: '',
remark: '',
classifyId: 0
}
......@@ -74,6 +65,7 @@ export default {
remark: [
{ required: true, message: '项目代号不能为空', trigger: 'blur' }
],
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
classType: [
{ required: true, message: '类别不能为空', trigger: 'blur' }
]
......@@ -99,20 +91,14 @@ export default {
},
methods: {
_onKeyUp() {
if (
this.formObj.alias === '' ||
this.formObj.classType === '' ||
this.formObj.remark === ''
) {
if (this.formObj.name === '' || this.formObj.remark === '') {
this.isDisable = true
} else {
this.isDisable = false
this.action =
global.baseURL +
'/soil/v1/original_template/upload_template/?classType=' +
this.formObj.classType +
'&alias=' +
this.formObj.alias +
'/soil/v1/original_template/upload_template/?name=' +
this.formObj.name +
'&remark=' +
this.formObj.remark
}
......
pages/soil-report-manage/report-make/OriginalRecordEdit.vue
......@@ -46,14 +46,14 @@ export default {
let url = ''
if (process.env.NODE_ENV === 'production') {
url =
'http://record.patzn.com/print/v1/eln/form_YT_' +
'http://record.patzn.com/print/v1/eln/form_soil_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri)
} else {
url =
Global.recordURL +
'/print/v1/eln/form_YT_' +
'/print/v1/eln/form_soil_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri)
......@@ -73,7 +73,7 @@ export default {
let url = ''
if (process.env.NODE_ENV === 'production') {
url =
'http://record.patzn.com/print/v1/eln/form_YT_' +
'http://record.patzn.com/print/v1/eln/form_soil_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri) +
......@@ -82,7 +82,7 @@ export default {
} else {
url =
Global.recordURL +
'/print/v1/eln/form_YT_' +
'/print/v1/eln/form_soil_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri) +
......
pages/soil-sample-manage/sample-preparation-check/OriginalRecordEdit.vue
......@@ -50,7 +50,7 @@ export default {
Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
const url =
recordUrl +
'/print/v1/eln/form_YT_' +
'/print/v1/eln/form_soil_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri)
......@@ -73,7 +73,7 @@ export default {
Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
const url =
recordUrl +
'/print/v1/eln/form_YT_' +
'/print/v1/eln/form_soil_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri) +
......
pages/soil-sample-manage/sample-preparation/OriginalRecordEdit.vue
......@@ -50,7 +50,7 @@ export default {
Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
const url =
recordUrl +
'/print/v1/eln/form_YT_' +
'/print/v1/eln/form_soil_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri)
......@@ -73,7 +73,7 @@ export default {
Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
const url =
recordUrl +
'/print/v1/eln/form_YT_' +
'/print/v1/eln/form_soil_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri) +
......
pages/soil-sample-manage/sample-preparation/SoilSampleManageHis.vue
......@@ -56,9 +56,6 @@
</Col>
</Row>
</div>
<div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
</div>
<SoilSampleItemManage ref="sampleItemManage" @on-result-change="_page"></SoilSampleItemManage>
<DescribeDetailModal ref="writeDetailModal" @on-result-change="_page"></DescribeDetailModal>
<PreparationHis ref="preHisModal" @on-result-change="_page"></PreparationHis>
......
pages/soil-test-manage/test-input/OriginalRecordEdit.vue
......@@ -50,7 +50,7 @@ export default {
Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
const url =
recordUrl +
'/print/v1/eln/form_YT_' +
'/print/v1/eln/form_soil_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri)
......@@ -73,7 +73,7 @@ export default {
Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
const url =
recordUrl +
'/print/v1/eln/form_YT_' +
'/print/v1/eln/form_soil_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri) +
......
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