Skip to content

P
patzn-cloud-web-back-soil
Commit de916a3b by lichengming
Options

修改了试样管理

parent b0fa4083
Showing with 28 additions and 107 deletions
pages/soil-sample-manage/SoilSampleItemManage.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<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 class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary"> <Button @click="_formSearch" type="primary">
......
pages/soil-sample-manage/SoilSampleItemManageHis.vue
...@@ -11,11 +11,8 @@ ...@@ -11,11 +11,8 @@
<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 label="检测依据:" class="search-item">
<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 @click="_formSearch" type="primary"> <Button @click="_formSearch" type="primary">
......
pages/soil-sample-manage/sample-take/ItemManage.vue
...@@ -9,29 +9,26 @@ ...@@ -9,29 +9,26 @@
<Col span="24"> <Col span="24">
<Form v-show="searchOpen" :label-width="110" inline onsubmit="return false"> <Form v-show="searchOpen" :label-width="110" 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.num" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/> <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验名称" clearable/>
</Form-item>
<Form-item label="样品名称:" class="search-item">
<Input v-model="formObj.sampleName" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
</Form> </Form>
</Col> </Col>
<!--操作--> <!--操作-->
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :show-search-btn="true" class="contHide" @on-result-change="_btnClick"> <btn-list :msg="btn" :show-search-btn="true" @on-result-change="_btnClick" class="contHide">
</btn-list> </btn-list>
</Col> </Col>
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable <PTVXETable
ref="pageTable" :table-height="tableHeight" :get-page="getPage" ref="pageTable" :table-height="tableHeight" :get-page="getPage"
@on-result-change="_tableResultChange"
is-group is-group
select-data select-data>
@on-result-change="_tableResultChange">
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -54,9 +51,9 @@ ...@@ -54,9 +51,9 @@
<div v-else-if="item.key==='qualified'">{{scope.row.qualified?scope.row.qualified.display:''}}</div> <div v-else-if="item.key==='qualified'">{{scope.row.qualified?scope.row.qualified.display:''}}</div>
<!--科室 start--> <!--科室 start-->
<div v-else-if="item.key==='groupName'"> <div v-else-if="item.key==='groupName'">
<el-select v-model="scope.row.groupName" transfer size="small" <el-select v-model="scope.row.groupName" @change="_groupChange" @click.native.stop="_handleRow(scope)"
@change="_groupChange" transfer
@click.native.stop="_handleRow(scope)"> size="small">
<el-option v-for="item in groupData" :key="item.name" :label="item.name" <el-option v-for="item in groupData" :key="item.name" :label="item.name"
:value="item.name"></el-option> :value="item.name"></el-option>
</el-select> </el-select>
...@@ -65,10 +62,10 @@ ...@@ -65,10 +62,10 @@
<!--检测依据简称 start--> <!--检测依据简称 start-->
<div v-else-if="item.key==='testBasisSm'"> <div v-else-if="item.key==='testBasisSm'">
<el-select v-model="scope.row.testBasisSm" <el-select v-model="scope.row.testBasisSm"
@change="_saveTestBasisSm(scope)"
placeholder="请选择检测依据简称" placeholder="请选择检测依据简称"
size="small" size="small"
style="width:100%" style="width:100%">
@change="_saveTestBasisSm(scope)">
<el-option <el-option
v-for="item in testBasisSmList" v-for="item in testBasisSmList"
:key="item" :key="item"
......
pages/soil-test-manage/test-data-audit/AuditIndex.vue
...@@ -2,14 +2,6 @@ ...@@ -2,14 +2,6 @@
<div> <div>
<div class="layout-content-padding"> <div class="layout-content-padding">
<div class="layout-content-main"> <div class="layout-content-main">
<!-- <el-tabs v-model="activeName" @tab-click="_changeTabs">-->
<!-- <el-tab-pane label="数据审核" name="check">-->
<!-- <SampleBackupsManage ref="checkTabs"></SampleBackupsManage>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="历史任务" name="checkHis">-->
<!-- <SampleBackupsQuery ref="checkHisTabs"></SampleBackupsQuery>-->
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
<el-tabs v-model="activeName" @tab-click="_changeTabs"> <el-tabs v-model="activeName" @tab-click="_changeTabs">
<el-tab-pane label="数据审核" name="check"></el-tab-pane> <el-tab-pane label="数据审核" name="check"></el-tab-pane>
<el-tab-pane label="历史任务" name="checkHis"></el-tab-pane> <el-tab-pane label="历史任务" name="checkHis"></el-tab-pane>
......
pages/soil-test-manage/test-data-audit/DataAuditHis.vue
...@@ -65,10 +65,6 @@ ...@@ -65,10 +65,6 @@
<!-- eslint-disable-next-line vue/require-component-is --> <!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component> <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
</keep-alive> </keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
<!-- <SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>-->
</div> </div>
</template> </template>
<script> <script>
......
pages/soil-test-manage/test-data-audit/SoilSampleItemManageHis.vue
...@@ -11,11 +11,8 @@ ...@@ -11,11 +11,8 @@
<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 label="检测依据:" class="search-item">
<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 @click="_formSearch" type="primary"> <Button @click="_formSearch" type="primary">
......
pages/soil-test-manage/test-data-audit/SoilSampleManageHis.vue
...@@ -171,15 +171,6 @@ export default { ...@@ -171,15 +171,6 @@ export default {
} }
this._importItemOk({ sampleIds: this.selectIds, drugItemList: data }) this._importItemOk({ sampleIds: this.selectIds, drugItemList: data })
}, },
// _importItemOk: async function(data) {
// const result = await drugSample.importSampleItemDTO(data)
// if (result) {
// this.$Message.success('导入成功！')
// await this._page()
// }
// },
_modalResult(data1, data2) { _modalResult(data1, data2) {
switch (this.currentComponent) { switch (this.currentComponent) {
case 'CopyModal': case 'CopyModal':
...@@ -368,6 +359,7 @@ export default { ...@@ -368,6 +359,7 @@ export default {
this.$refs.pageTable._pageChange(1) this.$refs.pageTable._pageChange(1)
}, },
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilTest.pageExpAuditSampleHis(this.formObj) const result = await soilTest.pageExpAuditSampleHis(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
......
pages/soil-test-manage/test-data-check/DataCheckHis.vue
...@@ -65,10 +65,6 @@ ...@@ -65,10 +65,6 @@
<!-- eslint-disable-next-line vue/require-component-is --> <!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component> <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
</keep-alive> </keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
<!-- <SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>-->
</div> </div>
</template> </template>
<script> <script>
...@@ -138,11 +134,7 @@ export default { ...@@ -138,11 +134,7 @@ export default {
} }
} }
}, },
mounted() { mounted() {},
// this._page()
// 样品接收是否选择人员
// this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
},
methods: { methods: {
_userResult(data, msg) { _userResult(data, msg) {
const sendData = { const sendData = {
...@@ -387,7 +379,7 @@ export default { ...@@ -387,7 +379,7 @@ export default {
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
case 'page': case 'page':
this.getPage = this.$store.state.FoodContract.page this._page()
break break
case 'selectIds': case 'selectIds':
this.selectIds = data this.selectIds = data
......
pages/soil-test-manage/test-data-check/SoilSampleItemManageHis.vue
...@@ -11,11 +11,8 @@ ...@@ -11,11 +11,8 @@
<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 label="检测依据:" class="search-item">
<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 @click="_formSearch" type="primary"> <Button @click="_formSearch" type="primary">
......
pages/soil-test-manage/test-data-check/SoilSampleManageHis.vue
...@@ -171,15 +171,6 @@ export default { ...@@ -171,15 +171,6 @@ export default {
} }
this._importItemOk({ sampleIds: this.selectIds, drugItemList: data }) this._importItemOk({ sampleIds: this.selectIds, drugItemList: data })
}, },
// _importItemOk: async function(data) {
// const result = await drugSample.importSampleItemDTO(data)
// if (result) {
// this.$Message.success('导入成功！')
// await this._page()
// }
// },
_modalResult(data1, data2) { _modalResult(data1, data2) {
switch (this.currentComponent) { switch (this.currentComponent) {
case 'CopyModal': case 'CopyModal':
...@@ -368,6 +359,7 @@ export default { ...@@ -368,6 +359,7 @@ export default {
this.$refs.pageTable._pageChange(1) this.$refs.pageTable._pageChange(1)
}, },
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilTest.pageExpCheckSampleHis(this.formObj) const result = await soilTest.pageExpCheckSampleHis(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
......
pages/soil-test-manage/test-data-consult/DataConsult.vue
...@@ -65,10 +65,6 @@ ...@@ -65,10 +65,6 @@
<!-- eslint-disable-next-line vue/require-component-is --> <!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component> <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
</keep-alive> </keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
<!-- <SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>-->
</div> </div>
</template> </template>
<script> <script>
......
pages/soil-test-manage/test-data-consult/SoilSampleItemManageHis.vue
...@@ -11,11 +11,8 @@ ...@@ -11,11 +11,8 @@
<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 label="检测依据:" class="search-item">
<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 @click="_formSearch" type="primary"> <Button @click="_formSearch" type="primary">
......
pages/soil-test-manage/test-data-consult/SoilSampleManageHis.vue
...@@ -95,7 +95,6 @@ export default { ...@@ -95,7 +95,6 @@ export default {
id: '', id: '',
name: '管理检测项目' name: '管理检测项目'
} }
// { type: 'md-trash', id: '', name: '删除' }
], ],
entrustId: '', // 委托id entrustId: '', // 委托id
showModal: false, showModal: false,
...@@ -171,15 +170,6 @@ export default { ...@@ -171,15 +170,6 @@ export default {
} }
this._importItemOk({ sampleIds: this.selectIds, drugItemList: data }) this._importItemOk({ sampleIds: this.selectIds, drugItemList: data })
}, },
// _importItemOk: async function(data) {
// const result = await drugSample.importSampleItemDTO(data)
// if (result) {
// this.$Message.success('导入成功！')
// await this._page()
// }
// },
_modalResult(data1, data2) { _modalResult(data1, data2) {
switch (this.currentComponent) { switch (this.currentComponent) {
case 'CopyModal': case 'CopyModal':
...@@ -368,6 +358,7 @@ export default { ...@@ -368,6 +358,7 @@ export default {
this.$refs.pageTable._pageChange(1) this.$refs.pageTable._pageChange(1)
}, },
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilTest.pageExpAuditSampleHis(this.formObj) const result = await soilTest.pageExpAuditSampleHis(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
......
pages/soil-test-manage/test-input/SoilSampleItemManageHis.vue
...@@ -11,11 +11,8 @@ ...@@ -11,11 +11,8 @@
<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 label="检测依据:" class="search-item">
<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 @click="_formSearch" type="primary"> <Button @click="_formSearch" type="primary">
......
pages/soil-test-manage/test-input/SoilSampleManageHis.vue
...@@ -171,15 +171,6 @@ export default { ...@@ -171,15 +171,6 @@ export default {
} }
this._importItemOk({ sampleIds: this.selectIds, drugItemList: data }) this._importItemOk({ sampleIds: this.selectIds, drugItemList: data })
}, },
// _importItemOk: async function(data) {
// const result = await drugSample.importSampleItemDTO(data)
// if (result) {
// this.$Message.success('导入成功！')
// await this._page()
// }
// },
_modalResult(data1, data2) { _modalResult(data1, data2) {
switch (this.currentComponent) { switch (this.currentComponent) {
case 'CopyModal': case 'CopyModal':
...@@ -368,6 +359,7 @@ export default { ...@@ -368,6 +359,7 @@ export default {
this.$refs.pageTable._pageChange(1) this.$refs.pageTable._pageChange(1)
}, },
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilTest.pageExpTestSampleHis(this.formObj) const result = await soilTest.pageExpTestSampleHis(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
......
pages/soil-test-manage/test-input/TestInputHis.vue
...@@ -65,10 +65,6 @@ ...@@ -65,10 +65,6 @@
<!-- eslint-disable-next-line vue/require-component-is --> <!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component> <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
</keep-alive> </keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
<!-- <SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>-->
</div> </div>
</template> </template>
<script> <script>
......
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