Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-web-back-soil
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangweidong
patzn-cloud-web-back-soil
Commits
2b1dcf46
Commit
2b1dcf46
authored
Oct 28, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了试样检测的历史任务
parent
4a27e317
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
7 deletions
+16
-7
soil-test.js
api/soil/soil-test.js
+2
-0
SoilSampleItemManageHis.vue
pages/soil-test-manage/SoilSampleItemManageHis.vue
+0
-0
SoilSampleManageHis.vue
pages/soil-test-manage/SoilSampleManageHis.vue
+0
-0
DataAuditHis.vue
pages/soil-test-manage/test-data-audit/DataAuditHis.vue
+4
-1
DataCheckHis.vue
pages/soil-test-manage/test-data-check/DataCheckHis.vue
+4
-2
TestInputHis.vue
pages/soil-test-manage/test-input/TestInputHis.vue
+5
-3
ItemLeftList.vue
...k-manage/entrust-sample-manage/item-tabs/ItemLeftList.vue
+1
-1
No files found.
api/soil/soil-test.js
View file @
2b1dcf46
...
@@ -21,6 +21,8 @@ export default {
...
@@ -21,6 +21,8 @@ export default {
http
.
post
(
'soil/v1/experiment/page_allot'
,
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/experiment/page_allot'
,
data
).
then
(
res
=>
res
),
pageExpTest
:
data
=>
pageExpTest
:
data
=>
http
.
post
(
'soil/v1/entrust/page_exp_test'
,
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/entrust/page_exp_test'
,
data
).
then
(
res
=>
res
),
pageExpTestHis
:
data
=>
http
.
post
(
'soil/v1/entrust/page_exp_test_his'
,
data
).
then
(
res
=>
res
),
samplePage
:
data
=>
http
.
post
(
'soil/v1/sample/page'
,
data
).
then
(
res
=>
res
),
samplePage
:
data
=>
http
.
post
(
'soil/v1/sample/page'
,
data
).
then
(
res
=>
res
),
pageExpTestSample
:
data
=>
pageExpTestSample
:
data
=>
http
.
post
(
'soil/v1/sample/page_exp_test_sample'
,
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/sample/page_exp_test_sample'
,
data
).
then
(
res
=>
res
),
...
...
pages/soil-test-manage/SoilSampleItemManageHis.vue
0 → 100644
View file @
2b1dcf46
This diff is collapsed.
Click to expand it.
pages/soil-test-manage/SoilSampleManageHis.vue
0 → 100644
View file @
2b1dcf46
This diff is collapsed.
Click to expand it.
pages/soil-test-manage/test-data-audit/DataAuditHis.vue
View file @
2b1dcf46
...
@@ -64,16 +64,19 @@
...
@@ -64,16 +64,19 @@
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<Operation
ref=
"operation"
></Operation>
<Operation
ref=
"operation"
></Operation>
<FileManage
ref=
"FileManage"
></FileManage>
<FileManage
ref=
"FileManage"
></FileManage>
<SoilSampleManageHis
ref=
"sampleManageModal"
></SoilSampleManageHis>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
UserInfo
from
'../../../components/user-info-single/AssignPerson'
import
UserInfo
from
'../../../components/user-info-single/AssignPerson'
import
{
soilTest
}
from
'../../../api'
import
{
soilTest
}
from
'../../../api'
import
Operation
from
'../../../components/operation/Operation'
import
Operation
from
'../../../components/operation/Operation'
import
SoilSampleManageHis
from
'../SoilSampleManageHis'
export
default
{
export
default
{
components
:
{
components
:
{
UserInfo
,
UserInfo
,
Operation
Operation
,
SoilSampleManageHis
},
},
data
()
{
data
()
{
return
{
return
{
...
...
pages/soil-test-manage/test-data-check/DataCheckHis.vue
View file @
2b1dcf46
...
@@ -64,16 +64,19 @@
...
@@ -64,16 +64,19 @@
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<Operation
ref=
"operation"
></Operation>
<Operation
ref=
"operation"
></Operation>
<FileManage
ref=
"FileManage"
></FileManage>
<FileManage
ref=
"FileManage"
></FileManage>
<SoilSampleManageHis
ref=
"sampleManageModal"
></SoilSampleManageHis>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
UserInfo
from
'../../../components/user-info-single/AssignPerson'
import
UserInfo
from
'../../../components/user-info-single/AssignPerson'
import
{
soilTest
}
from
'../../../api'
import
{
soilTest
}
from
'../../../api'
import
Operation
from
'../../../components/operation/Operation'
import
Operation
from
'../../../components/operation/Operation'
import
SoilSampleManageHis
from
'../SoilSampleManageHis'
export
default
{
export
default
{
components
:
{
components
:
{
UserInfo
,
UserInfo
,
Operation
Operation
,
SoilSampleManageHis
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -89,7 +92,6 @@ export default {
...
@@ -89,7 +92,6 @@ export default {
name
:
'管理样品'
name
:
'管理样品'
},
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
},
{
type
:
'md-trash'
,
id
:
''
,
name
:
'删除'
},
{
{
type
:
'ios-clock'
,
type
:
'ios-clock'
,
id
:
''
,
id
:
''
,
...
...
pages/soil-test-manage/test-input/TestInputHis.vue
View file @
2b1dcf46
...
@@ -64,16 +64,19 @@
...
@@ -64,16 +64,19 @@
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<Operation
ref=
"operation"
></Operation>
<Operation
ref=
"operation"
></Operation>
<FileManage
ref=
"FileManage"
></FileManage>
<FileManage
ref=
"FileManage"
></FileManage>
<SoilSampleManageHis
ref=
"sampleManageModal"
></SoilSampleManageHis>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
UserInfo
from
'../../../components/user-info-single/AssignPerson'
import
UserInfo
from
'../../../components/user-info-single/AssignPerson'
import
{
soilTest
}
from
'../../../api'
import
{
soilTest
}
from
'../../../api'
import
Operation
from
'../../../components/operation/Operation'
import
Operation
from
'../../../components/operation/Operation'
import
SoilSampleManageHis
from
'../SoilSampleManageHis'
export
default
{
export
default
{
components
:
{
components
:
{
UserInfo
,
UserInfo
,
Operation
Operation
,
SoilSampleManageHis
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -89,7 +92,6 @@ export default {
...
@@ -89,7 +92,6 @@ export default {
name
:
'管理样品'
name
:
'管理样品'
},
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
},
{
type
:
'md-trash'
,
id
:
''
,
name
:
'删除'
},
{
{
type
:
'ios-clock'
,
type
:
'ios-clock'
,
id
:
''
,
id
:
''
,
...
@@ -399,7 +401,7 @@ export default {
...
@@ -399,7 +401,7 @@ export default {
_page
:
async
function
()
{
_page
:
async
function
()
{
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
soilTest
.
pageExpTest
(
const
result
=
await
soilTest
.
pageExpTest
His
(
this
.
$serializeForm
(
this
.
formObj
)
this
.
$serializeForm
(
this
.
formObj
)
)
)
if
(
result
)
{
if
(
result
)
{
...
...
pages/soil-test-manage/test-task-manage/entrust-sample-manage/item-tabs/ItemLeftList.vue
View file @
2b1dcf46
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<Col
span=
"24"
>
<Col
span=
"24"
>
<Form
id=
"task-assign-item-left"
:label-width=
"70"
inline
onsubmit=
"return false"
>
<Form
id=
"task-assign-item-left"
:label-width=
"70"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"检测项目
1
:"
>
<Form-item
class=
"search-item"
label=
"检测项目:"
>
<Input
v-model=
"formObj.client"
@
on-enter=
"_formSearch"
placeholder=
"请输入检测项目"
clearable
></Input>
<Input
v-model=
"formObj.client"
@
on-enter=
"_formSearch"
placeholder=
"请输入检测项目"
clearable
></Input>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment