Commit 9d31a1b6 by lichengming

修改了样品拆分子样品编辑

parent 748949a6
...@@ -314,5 +314,7 @@ export default { ...@@ -314,5 +314,7 @@ export default {
.post('soil/v1/alone_in_out_stock/get_stay_date', data) .post('soil/v1/alone_in_out_stock/get_stay_date', data)
.then(res => res), .then(res => res),
outStorageBack: data => outStorageBack: data =>
http.post('soil/v1/alone_sample/out_storage_back', data).then(res => res) http.post('soil/v1/alone_sample/out_storage_back', data).then(res => res),
editSample: data =>
http.put('soil/v1/sample/' + data.id, data.obj).then(res => res)
} }
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
<DescribeDetailModal ref="writeDetailModal" @on-result-change="_page"></DescribeDetailModal> <DescribeDetailModal ref="writeDetailModal" @on-result-change="_page"></DescribeDetailModal>
<PreparationModal ref="preModal" @on-result-change="_page"></PreparationModal> <PreparationModal ref="preModal" @on-result-change="_page"></PreparationModal>
<SoilSampleSplit ref="splitModal" @on-result-change="_page"></SoilSampleSplit> <SoilSampleSplit ref="splitModal" @on-result-change="_page"></SoilSampleSplit>
<SoilSampleSplitChild ref="splitModalChild" @on-result-change="_page"></SoilSampleSplitChild>
<SelectFlowRelBtn ref="flow"/> <SelectFlowRelBtn ref="flow"/>
</div> </div>
</template> </template>
...@@ -77,13 +78,15 @@ import SoilSampleItemManage from './SoilSampleItemManage' ...@@ -77,13 +78,15 @@ import SoilSampleItemManage from './SoilSampleItemManage'
import DescribeDetailModal from './sample-preparation/DescribeDetailModal' import DescribeDetailModal from './sample-preparation/DescribeDetailModal'
import PreparationModal from './sample-preparation/Preparation' import PreparationModal from './sample-preparation/Preparation'
import SoilSampleSplit from './SoilSampleSplit' import SoilSampleSplit from './SoilSampleSplit'
import SoilSampleSplitChild from './SoilSampleSplitChild'
export default { export default {
components: { components: {
SoilSampleItemManage, SoilSampleItemManage,
DescribeDetailModal, DescribeDetailModal,
PreparationModal, PreparationModal,
SoilSampleSplit, SoilSampleSplit,
SelectFlowRelBtn SelectFlowRelBtn,
SoilSampleSplitChild
}, },
data() { data() {
return { return {
...@@ -277,7 +280,11 @@ export default { ...@@ -277,7 +280,11 @@ export default {
}, },
_sampleSplit() { _sampleSplit() {
if (this.selectData.length === 1) { if (this.selectData.length === 1) {
this.$refs.splitModal._open(this.selectData[0]) if (this.selectData[0].sampleCode.indexOf('-') === -1) {
this.$refs.splitModal._open(this.selectData[0])
} else {
this.$refs.splitModalChild._open(this.selectData[0])
}
} else { } else {
this.$Message.warning('请选择一条数据') this.$Message.warning('请选择一条数据')
} }
...@@ -366,6 +373,7 @@ export default { ...@@ -366,6 +373,7 @@ export default {
this.$refs.pageTable._pageChange(1) this.$refs.pageTable._pageChange(1)
}, },
_page: async function() { _page: async function() {
this.$forceUpdate()
this.selectData = [] this.selectData = []
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.entrustId = this.contractId this.formObj.entrustId = this.contractId
......
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