Commit ed4e6879 by wangweidong

送样流程

parent ebfefe6c
...@@ -70,6 +70,12 @@ export default { ...@@ -70,6 +70,12 @@ export default {
http http
.post('meter/v1/sample/submit_report_to_check?ids=' + data) .post('meter/v1/sample/submit_report_to_check?ids=' + data)
.then(res => res), .then(res => res),
submitFlow: data =>
https
.post('meter/v1/sample/sample_flow', JSON.stringify(data))
.then(res => res),
generateReport: data => generateReport: data =>
https https
.post('meter/v1/sample/report_generate', JSON.stringify(data)) .post('meter/v1/sample/report_generate', JSON.stringify(data))
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</div> </div>
<MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage> <MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage>
<personModal ref="personModal"></personModal> <personModal ref="personModal"></personModal>
<ListModal ref="ListModal"></ListModal> <ListModal ref="ListModal" @on-result-change="_page"></ListModal>
</div> </div>
</template> </template>
<script> <script>
......
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
<!-- <Input v-model="scope.row.person" name="person" placeholder="请输入流转人" style="width: 100px;" />--> <!-- <Input v-model="scope.row.person" name="person" placeholder="请输入流转人" style="width: 100px;" />-->
<Input <Input
v-model="scope.row.flower" v-model="scope.row.flower"
@click.native="_selectStaff(scope.$index)"
readonly="readonly" readonly="readonly"
placeholder="请选择人员" placeholder="请选择人员"
@click.native="_selectStaff(scope.$index)"
/> />
</span> </span>
<span v-else-if="item.key==='flowTime'"> <span v-else-if="item.key==='flowTime'">
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" /> <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
</div> </div>
</Modal> </Modal>
<UserInfo ref="userModal" @on-result-change="_userData" is-change /> <UserInfo ref="userModal" is-change @on-result-change="_userData" />
</div> </div>
</template> </template>
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
import UserInfo from '../../../components/user-info-single/assignPerson' import UserInfo from '../../../components/user-info-single/assignPerson'
// import { drugSample } from '../../api' // import { drugSample } from '../../api'
import Global from '../../../api/config' import Global from '../../../api/config'
import { meterSample } from '../../../api'
export default { export default {
name: 'TransferListModal', name: 'TransferListModal',
...@@ -185,6 +186,7 @@ export default { ...@@ -185,6 +186,7 @@ export default {
const object = data[i] const object = data[i]
const obj = {} const obj = {}
// obj.sampleId = object.id // obj.sampleId = object.id
obj.id = object.id
obj.code = object.code obj.code = object.code
obj.name = object.name obj.name = object.name
obj.spec = object.spec obj.spec = object.spec
...@@ -193,7 +195,7 @@ export default { ...@@ -193,7 +195,7 @@ export default {
obj.flower = user.realname obj.flower = user.realname
obj.flowerId = user.userId obj.flowerId = user.userId
obj.flowTime = time obj.flowTime = time
obj.flowQuantity = 1 obj.flowQuantity = object.quantity
this.getPage.records.push(obj) this.getPage.records.push(obj)
} }
// this.$refs.pageTable._initTable() // this.$refs.pageTable._initTable()
...@@ -217,12 +219,12 @@ export default { ...@@ -217,12 +219,12 @@ export default {
console.log(data) console.log(data)
}, },
_flow: async function(data) { _flow: async function(data) {
// const result = await drugSample.submitFlow({ sampleFlows: data }) const result = await meterSample.submitFlow({ sampleVOList: data })
// if (result) { if (result) {
// this.showListModal = false this.showListModal = false
// this.$message.success('流转成功') this.$message.success('流转成功')
// this.$emit('on-result-change') this.$emit('on-result-change')
// } }
} }
} }
} }
......
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