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