Commit defb0d18 by lichengming

修改了委托单试验项目列表按钮

parent c1730110
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
<Col span="24"> <Col span="24">
<Form id="search-sample-company" v-show="searchOpen" :label-width="90" inline onsubmit="return false"> <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" @on-enter="_formSearch" placeholder="请输入检测项目" clearable /> <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" @on-enter="_formSearch" placeholder="请输入检测依据" clearable /> <Input v-model="formObj.groupName" @on-enter="_formSearch" placeholder="请输入试验科室" clearable />
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary"> <Button @click="_formSearch" type="primary">
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
formObj: { formObj: {
name: undefined, name: undefined,
sampleId: undefined, sampleId: undefined,
code: undefined groupName: undefined
} }
} }
}, },
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
<Operation ref="operationModal"></Operation> <Operation ref="operationModal"></Operation>
<EntrustRegisterEdit ref="editModal" @on-result-change="_formSearch"></EntrustRegisterEdit> <EntrustRegisterEdit ref="editModal" @on-result-change="_formSearch"></EntrustRegisterEdit>
<SoilSampleManage ref="sampleManageModal" @on-result-change="_page"></SoilSampleManage> <SoilSampleManage ref="sampleManageModal" @on-result-change="_page"></SoilSampleManage>
<SoilSampleItemManage ref="itemManageModal" @on-result-change="_page"></SoilSampleItemManage>
</div> </div>
</template> </template>
<script> <script>
...@@ -60,9 +61,16 @@ import http from '../../../api/http' ...@@ -60,9 +61,16 @@ import http from '../../../api/http'
import Operation from '../../../components/operation/Operation' import Operation from '../../../components/operation/Operation'
import SoilSampleManage from '../SoilSampleManage' import SoilSampleManage from '../SoilSampleManage'
import importModal from '../../../components/import/DownloadTemplateImport' import importModal from '../../../components/import/DownloadTemplateImport'
import SoilSampleItemManage from '../SoilSampleItemManage'
import EntrustRegisterEdit from './EntrustRegisterEdit' import EntrustRegisterEdit from './EntrustRegisterEdit'
export default { export default {
components: { Operation, EntrustRegisterEdit, SoilSampleManage, importModal }, components: {
Operation,
EntrustRegisterEdit,
SoilSampleManage,
importModal,
SoilSampleItemManage
},
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -101,6 +109,11 @@ export default { ...@@ -101,6 +109,11 @@ export default {
id: '', id: '',
name: '试样列表' name: '试样列表'
}, },
{
type: 'ios-apps',
id: '',
name: '试验项目列表'
},
// { // {
// type: 'ios-beaker', // type: 'ios-beaker',
// id: '', // id: '',
...@@ -204,6 +217,9 @@ export default { ...@@ -204,6 +217,9 @@ export default {
case '试样列表': case '试样列表':
this._sampleManage(data.id) this._sampleManage(data.id)
break break
case '试验项目列表':
this._itemManage(data.id)
break
case '附件': case '附件':
this._upload(data.id) this._upload(data.id)
break break
...@@ -224,6 +240,10 @@ export default { ...@@ -224,6 +240,10 @@ export default {
// 管理样品 // 管理样品
this.$refs.sampleManageModal._open(data) this.$refs.sampleManageModal._open(data)
}, },
_itemManage(data) {
// 管理样品
this.$refs.itemManageModal._open(data)
},
_submitToReview() { _submitToReview() {
this._submitByContractIds('委托评审') this._submitByContractIds('委托评审')
}, },
......
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