Skip to content

P
patzn-cloud-web-back-soil
Commit 7fbd6997 by lichengming
Options

修改了开土制备管理检测项目按钮

parent 5bf063d1
Showing with 58 additions and 69 deletions
api/soil/soil-entrust.js
...@@ -58,5 +58,10 @@ export default { ...@@ -58,5 +58,10 @@ export default {
'soil/v1/sample/' + data.id + '?describeDetail=' + data.describeDetail 'soil/v1/sample/' + data.id + '?describeDetail=' + data.describeDetail
), ),
weiteSoilDetail: data => weiteSoilDetail: data =>
http.post('soil/v1/sample/write_soil_detail', data).then(res => res) http.post('soil/v1/sample/write_soil_detail', data).then(res => res),
pageBackup: data =>
http.post('soil/v1/sample_backup/page_backup', data).then(res => res),
// 试验项目列表
experimentPage: data =>
http.post('soil/v1/experiment/page', data).then(res => res)
} }
pages/soil-sample-manage/SoilSampleItemManage.vue
...@@ -9,16 +9,16 @@ ...@@ -9,16 +9,16 @@
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24"> <Col span="24">
<Form v-show="searchOpen" id="search-sample-company" inline onsubmit="return false" :label-width="90"> <Form id="search-sample-company" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item label="检测项目:" class="search-item"> <Form-item label="检测项目:" class="search-item">
<Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
</Form-item> </Form-item>
<Form-item label="检测依据:" class="search-item"> <Form-item label="检测依据:" class="search-item">
<Input v-model="formObj.code" placeholder="请输入检测依据" clearable @on-enter="_formSearch" /> <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入检测依据" clearable />
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch"> <Button @click="_formSearch" type="primary">
搜索 搜索
</Button> </Button>
</Form-item> </Form-item>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</Col> </Col>
<!--操作--> <!--操作-->
<Col span="24"> <Col span="24">
<btn-list :msg="btn" class="contHide" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick"></btn-list> <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
</Col> </Col>
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a> <a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
</div> </div>
<div v-else-if="item.key==='epibolyItem'" @click.stop="_handleRow(scope)"> <div v-else-if="item.key==='epibolyItem'" @click.stop="_handleRow(scope)">
<el-select v-if="showOption" v-model="scope.row.epibolyItem" placeholder="请选择" @change="_optionChange(scope.row)"> <el-select v-if="showOption" v-model="scope.row.epibolyItem" @change="_optionChange(scope.row)" placeholder="请选择">
<el-option <el-option
v-for="(item,index) in subOptions" v-for="(item,index) in subOptions"
:key="index" :key="index"
...@@ -54,9 +54,7 @@ ...@@ -54,9 +54,7 @@
</el-select> </el-select>
<span v-if="!showOption">{{ scope.row[item.key]===0? '否':'是' }}</span> <span v-if="!showOption">{{ scope.row[item.key]===0? '否':'是' }}</span>
</div> </div>
<div v-else-if="item.key==='progress'"> <span v-else-if="item.status">{{scope.row[item.key]}}</span>
{{ scope.row[item.key].display }}
</div>
<div v-else-if="item.judged"> <div v-else-if="item.judged">
{{ scope.row[item.key]===0? '否':'是' }} {{ scope.row[item.key]===0? '否':'是' }}
</div> </div>
...@@ -66,35 +64,35 @@ ...@@ -66,35 +64,35 @@
<div v-else-if="item.key==='code'" @click.stop="_handleRow(scope)"> <div v-else-if="item.key==='code'" @click.stop="_handleRow(scope)">
<el-input <el-input
v-model="scope.row.code" v-model="scope.row.code"
@blur="_codeEdit({id:scope.row.id, obj :{code:scope.row.code}})"
style="width: 130px;" style="width: 130px;"
blur blur
placeholder="请选择检测依据" placeholder="请选择检测依据"
@blur="_codeEdit({id:scope.row.id, obj :{code:scope.row.code}})"
/> />
<i style="cursor: pointer;font-size: 14px;" class="icons iconfont pt-search icon-search" @click.stop="_selectjudgeBasis(scope.row.id,scope.$index)"></i> <i @click.stop="_selectjudgeBasis(scope.row.id,scope.$index)" style="cursor: pointer;font-size: 14px;" class="icons iconfont pt-search icon-search"></i>
</div> </div>
<div v-else-if="item.key==='compareSymbol'" @click.stop="_handleRow(scope)"> <div v-else-if="item.key==='compareSymbol'" @click.stop="_handleRow(scope)">
<el-input <el-input
v-model="scope.row.compareSymbol" v-model="scope.row.compareSymbol"
@blur="_compareSymbolEdit({id:scope.row.id, obj :{compareSymbol:scope.row.compareSymbol}})"
blur blur
placeholder="请输入比较符" placeholder="请输入比较符"
@blur="_compareSymbolEdit({id:scope.row.id, obj :{compareSymbol:scope.row.compareSymbol}})"
/> />
</div> </div>
<div v-else-if="item.key==='limitValue'" @click.stop="_handleRow(scope)"> <div v-else-if="item.key==='limitValue'" @click.stop="_handleRow(scope)">
<el-input <el-input
v-model="scope.row.limitValue" v-model="scope.row.limitValue"
@blur="_limitValueEdit({id:scope.row.id, obj :{limitValue:scope.row.limitValue}})"
blur blur
placeholder="请输入限值" placeholder="请输入限值"
@blur="_limitValueEdit({id:scope.row.id, obj :{limitValue:scope.row.limitValue}})"
/> />
</div> </div>
<div v-else-if="item.key==='unit'" @click.stop="_handleRow(scope)"> <div v-else-if="item.key==='unit'" @click.stop="_handleRow(scope)">
<el-input <el-input
v-model="scope.row.unit" v-model="scope.row.unit"
@blur="_unitEdit({id:scope.row.id, obj :{unit:scope.row.unit}})"
blur blur
placeholder="请输入单位" placeholder="请输入单位"
@blur="_unitEdit({id:scope.row.id, obj :{unit:scope.row.unit}})"
/> />
</div> </div>
<div v-else> <div v-else>
...@@ -143,19 +141,13 @@ export default { ...@@ -143,19 +141,13 @@ export default {
{ id: '', name: '关闭', type: 'primary' } { id: '', name: '关闭', type: 'primary' }
], ],
pageColumns: [ pageColumns: [
{ title: '项目类别', key: 'type', width: 160 }, { title: '试验名称', key: 'name', width: 160 },
{ title: '检测项目', key: 'name', width: 140 }, { title: '试验项目英文简写', key: 'shortName', width: 140 },
{ title: '子项目', key: 'sonItem', width: 140 }, { title: '大类', key: 'mainType', width: 140 },
{ title: '是否分包', key: 'epibolyItem' }, { title: '小类', key: 'smallType' },
{ title: '方法', key: 'method', width: 180 }, { title: '检测依据', key: 'testBasis', width: 180 },
{ title: '设备', key: 'device', width: 180 }, { title: '试验方法', key: 'testMethod', width: 180 },
{ title: '检测依据', key: 'code', width: 180 }, { title: '状态', key: 'status', width: 180 }
{ title: '检测科室', key: 'groupName', width: 110 },
{ title: '比较符', key: 'compareSymbol', width: 100 },
{ title: '限值', key: 'limitValue' },
{ title: '单位', key: 'unit' },
{ title: '是否系统判定', key: 'judged', width: 120, judged: true },
{ title: '备注', key: 'remark' }
], ],
subOptions: [ subOptions: [
{ {
...@@ -473,7 +465,9 @@ export default { ...@@ -473,7 +465,9 @@ export default {
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj = this.$serializeForm(this.formObj) this.formObj = this.$serializeForm(this.formObj)
this.formObj.sampleId = this.sampleId this.formObj.sampleId = this.sampleId
const result = await soilEntrust.page(this.$serializeForm(this.formObj)) const result = await soilEntrust.experimentPage(
this.$serializeForm(this.formObj)
)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
this.getPage = result this.getPage = result
......
pages/soil-sample-manage/SoilSampleManage.vue
...@@ -98,16 +98,11 @@ export default { ...@@ -98,16 +98,11 @@ export default {
{ {
type: 'success', type: 'success',
id: '', id: '',
name: '导入检测项目' name: '试样制备'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'ZBC',
name: '导入检测项目包'
},
{
type: 'success',
id: '',
name: '打印标签' name: '打印标签'
}, },
{ {
...@@ -248,6 +243,8 @@ export default { ...@@ -248,6 +243,8 @@ export default {
case '打印标签': case '打印标签':
this._printLabel() this._printLabel()
break break
case '试样制备':
break
case '批量填写土质描述详情': case '批量填写土质描述详情':
this._writeDetail(this.selectIds) this._writeDetail(this.selectIds)
break break
......
pages/soil-sample-manage/backups-manage/tab/SampleBackupsManage.vue
...@@ -22,13 +22,6 @@ ...@@ -22,13 +22,6 @@
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" :showSearchBtn="true" <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" :showSearchBtn="true"
class="contHide"> class="contHide">
<template slot="processTask">
<div class="fr process-task">
<el-checkbox v-model="warnAndOver" style="margin-right: 80px;margin-top: 7px;" @change="_relPage" :true-label="1"
:false-label="0" size="medium">只看预警和超期样品
</el-checkbox>
</div>
</template>
</btn-list> </btn-list>
</Col> </Col>
<!--样品数量--> <!--样品数量-->
...@@ -60,7 +53,7 @@ ...@@ -60,7 +53,7 @@
sortable sortable
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.key==='progress'"> <div v-if="item.key==='status'">
{{scope.row[item.key]===undefined?'':scope.row[item.key].display}} {{scope.row[item.key]===undefined?'':scope.row[item.key].display}}
</div> </div>
<a v-else-if="item.key==='code'" @click.stop="_detailModal(scope.row)">{{scope.row[item.key]}}</a> <a v-else-if="item.key==='code'" @click.stop="_detailModal(scope.row)">{{scope.row[item.key]}}</a>
...@@ -157,7 +150,7 @@ export default { ...@@ -157,7 +150,7 @@ export default {
id: 'food-sample-preparation-his-scan-pre', id: 'food-sample-preparation-his-scan-pre',
name: '扫码制备' name: '扫码制备'
}, },
{ type: '', id: '', name: '填写存放信息' }, // { type: '', id: '', name: '填写存放信息' },
// { type: '', id: '', name: '申请处理' }, // { type: '', id: '', name: '申请处理' },
// { type: '', id: '', name: '导出' }, // { type: '', id: '', name: '导出' },
{ {
...@@ -169,25 +162,24 @@ export default { ...@@ -169,25 +162,24 @@ export default {
iconMsg: [ iconMsg: [
{ type: 'md-create', id: '', name: '编辑' } // food-sample-prepare-edit { type: 'md-create', id: '', name: '编辑' } // food-sample-prepare-edit
], ],
iconMsgSave: [{ type: 'ios-checkmark-empty', id: '', name: '保存' }], iconMsgSave: [{ type: 'ios-checkmark', id: '', name: '保存' }],
pageColumns: [ pageColumns: [
{ title: '样品编号', key: 'sampleSn', width: 180 }, { title: '委托商', key: 'client', width: 180 },
{ title: '样品名称', key: 'sampleName', width: 140 }, { title: '委托编号', key: 'entrustCode', width: 180 },
{ title: '状态', key: 'progress', width: 110 }, { title: '存储条件', key: 'conditions', width: 180 },
{ title: '委托单位', key: 'cname', width: 160 }, { title: '试样编号', key: 'sampleCode', width: 180 },
{ title: '委托名称', key: 'contractName', width: 170 }, { title: '试样深度', key: 'sampleDepth', width: 180 },
{ title: '委托编号', key: 'code', width: 170 }, { title: '样品包装类型', key: 'samplePack', width: 180 },
{ title: '是否合格', key: 'isEligible', width: 170 }, { title: '现场编号', key: 'siteNo', width: 180 },
{ title: '报告签发日期', key: 'issueDate', width: 120, date: true }, { title: '备样位置', key: 'backupLocation', width: 180 },
{ title: '存储期限', key: 'endDate', width: 140 }, { title: '备样数量', key: 'quantity', width: 180 },
{ title: '存储位置', key: 'backupPlace', width: 140 }, { title: '备样人', key: 'backupUser', width: 140 },
{ title: '存储条件', key: 'storageCondition', width: 120 }, { title: '钻孔位置', key: 'boreholeLocation', width: 110 },
{ title: '样品数量', key: 'quantity', width: 100 }, { title: '钻孔名称', key: 'boreholeName', width: 160 },
{ title: '备样数量', key: 'sampleQuantity', width: 100 }, { title: '水深（米）', key: 'waterDepth', width: 160 },
{ title: '样品处理数量', key: 'handleQuantity', width: 200 }, { title: '状态', key: 'status', width: 160 },
{ title: '备注', key: 'remark' }, { title: '备份开始日期', key: 'startTime', width: 170 },
{ title: '样品备注', key: 'sampleRemark' }, { title: '备份结束日期', key: 'endTime', width: 170 }
{ title: '委托备注', key: 'contractRemark' }
/* {title: '处置方式', key: 'handleMethod', width: 120,}, */ /* {title: '处置方式', key: 'handleMethod', width: 120,}, */
], ],
conditionList: [], conditionList: [],
...@@ -303,11 +295,12 @@ export default { ...@@ -303,11 +295,12 @@ export default {
this.editIndex = index this.editIndex = index
break break
case '保存': case '保存':
if (data.endDate !== '') { console.log('保存')
// 非空情况下格式化赋值，如果不判断会格式化为当天的日期 // if (data.endDate !== '') {
this._endDateChange(this.$dateformat(data.endDate, 'yyyy-mm-dd')) // // 非空情况下格式化赋值，如果不判断会格式化为当天的日期
} // this._endDateChange(this.$dateformat(data.endDate, 'yyyy-mm-dd'))
this._save() // }
// this._save()
this.editIndex = -1 this.editIndex = -1
break break
} }
...@@ -540,7 +533,7 @@ export default { ...@@ -540,7 +533,7 @@ export default {
this.editIndex = -1 this.editIndex = -1
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj) console.log('this.formObj', this.formObj)
const result = await soilEntrust.pageSampleReceive( const result = await soilEntrust.pageBackup(
this.$serializeForm(this.formObj) this.$serializeForm(this.formObj)
) )
if (result) { if (result) {
......
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