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
da66a09b
Commit
da66a09b
authored
Nov 17, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了委托单登记
parent
071e02b8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 additions
and
46 deletions
+1
-46
EntrustIndex.vue
pages/meter-entrust/entrust-register/EntrustIndex.vue
+0
-1
EntrustRegister.vue
pages/meter-entrust/entrust-register/EntrustRegister.vue
+0
-38
SoilItemNum.vue
pages/soil-sample-manage/sample-preparation/SoilItemNum.vue
+0
-3
SampleSurplusManage.vue
...-sample-manage/surplus-manage/tab/SampleSurplusManage.vue
+1
-4
No files found.
pages/meter-entrust/entrust-register/EntrustIndex.vue
View file @
da66a09b
...
@@ -50,7 +50,6 @@ export default {
...
@@ -50,7 +50,6 @@ export default {
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_page
()
this
.
$refs
.
refModal
.
_page
()
})
})
// this.$refs.hisTabs._page()
}
}
}
}
}
}
...
...
pages/meter-entrust/entrust-register/EntrustRegister.vue
View file @
da66a09b
...
@@ -55,7 +55,6 @@
...
@@ -55,7 +55,6 @@
</template>
</template>
<
script
>
<
script
>
import
{
soilEntrust
}
from
'../../../api'
import
{
soilEntrust
}
from
'../../../api'
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'
...
@@ -117,21 +116,11 @@ export default {
...
@@ -117,21 +116,11 @@ export default {
id
:
''
,
id
:
''
,
name
:
'试验项目列表'
name
:
'试验项目列表'
},
},
// {
// type: 'ios-beaker',
// id: '',
// name: '管理样品'
// },
{
{
type
:
'md-cloud'
,
type
:
'md-cloud'
,
id
:
''
,
id
:
''
,
name
:
'附件'
name
:
'附件'
},
},
// {
// type: 'md-document',
// id: '',
// name: '导出委托单'
// },
{
{
type
:
'md-remove-circle'
,
type
:
'md-remove-circle'
,
id
:
''
,
id
:
''
,
...
@@ -210,7 +199,6 @@ export default {
...
@@ -210,7 +199,6 @@ export default {
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
data
,
'试验委托单导入'
)
this
.
$refs
.
refModal
.
_open
(
data
,
'试验委托单导入'
)
})
})
// this.$refs.importModal._open(data, '试验委托单导入')
},
},
_componentResult
(
msg
,
data
)
{
_componentResult
(
msg
,
data
)
{
switch
(
this
.
currentComponent
)
{
switch
(
this
.
currentComponent
)
{
...
@@ -243,9 +231,6 @@ export default {
...
@@ -243,9 +231,6 @@ export default {
case
'附件'
:
case
'附件'
:
this
.
_upload
(
data
.
id
)
this
.
_upload
(
data
.
id
)
break
break
case
'导出委托单'
:
this
.
_exportEntrust
(
data
.
id
)
break
case
'删除'
:
case
'删除'
:
this
.
_deleteByIds
([
data
.
id
])
this
.
_deleteByIds
([
data
.
id
])
break
break
...
@@ -262,7 +247,6 @@ export default {
...
@@ -262,7 +247,6 @@ export default {
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
data
)
this
.
$refs
.
refModal
.
_open
(
data
)
})
})
// this.$refs.sampleManageModal._open(data)
},
},
_itemManage
(
data
)
{
_itemManage
(
data
)
{
// 管理样品
// 管理样品
...
@@ -270,7 +254,6 @@ export default {
...
@@ -270,7 +254,6 @@ export default {
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_openByEntrustId
(
data
)
this
.
$refs
.
refModal
.
_openByEntrustId
(
data
)
})
})
// this.$refs.itemManageModal._openByEntrustId(data)
},
},
_submitToReview
()
{
_submitToReview
()
{
this
.
_submitByContractIds
(
'委托评审'
)
this
.
_submitByContractIds
(
'委托评审'
)
...
@@ -290,7 +273,6 @@ export default {
...
@@ -290,7 +273,6 @@ export default {
})
})
}
}
},
},
_submitByContractIds
(
cont
)
{
_submitByContractIds
(
cont
)
{
const
ids
=
this
.
selectIds
const
ids
=
this
.
selectIds
if
(
ids
.
length
===
0
)
{
if
(
ids
.
length
===
0
)
{
...
@@ -312,7 +294,6 @@ export default {
...
@@ -312,7 +294,6 @@ export default {
this
.
_resultChange
(
'提交成功'
)
this
.
_resultChange
(
'提交成功'
)
}
}
},
},
_subToSkipRe
:
async
function
(
ids
)
{
_subToSkipRe
:
async
function
(
ids
)
{
const
result
=
await
soilEntrust
.
submitSkipReview
(
ids
)
const
result
=
await
soilEntrust
.
submitSkipReview
(
ids
)
if
(
result
)
{
if
(
result
)
{
...
@@ -329,7 +310,6 @@ export default {
...
@@ -329,7 +310,6 @@ export default {
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
)
this
.
$refs
.
refModal
.
_open
(
id
)
})
})
// this.$refs.operationModal._open(id)
},
},
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
...
@@ -349,7 +329,6 @@ export default {
...
@@ -349,7 +329,6 @@ 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
)
const
result
=
await
soilEntrust
.
page
(
this
.
formObj
)
const
result
=
await
soilEntrust
.
page
(
this
.
formObj
)
if
(
result
)
{
if
(
result
)
{
this
.
$refs
.
pageTable
.
_hideLoading
()
this
.
$refs
.
pageTable
.
_hideLoading
()
...
@@ -380,32 +359,15 @@ export default {
...
@@ -380,32 +359,15 @@ export default {
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
()
this
.
$refs
.
refModal
.
_open
()
})
})
// this.$refs.editModal._open()
}
}
},
},
// 追加项目
_itemModal
(
data
)
{
this
.
$refs
.
refModal
.
_open
(
data
)
},
_upload
(
id
)
{
_upload
(
id
)
{
// 上传文件
// 上传文件
this
.
currentComponent
=
'FileManage'
this
.
currentComponent
=
'FileManage'
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
'entrustId'
)
this
.
$refs
.
refModal
.
_open
(
id
,
'entrustId'
)
})
})
// this.$refs.FileManage._open(id, 'entrustId')
},
_exportEntrust
(
id
)
{
this
.
$Modal
.
confirm
({
title
:
'提示'
,
content
:
'确定导出委托单?'
,
onOk
:
()
=>
{
http
.
open
(
'/meter/v1/entrust/export_send_entrust/?id='
+
id
)
}
})
},
},
_getById
:
async
function
(
id
)
{
_getById
:
async
function
(
id
)
{
const
result
=
await
soilEntrust
.
getVOById
(
id
)
const
result
=
await
soilEntrust
.
getVOById
(
id
)
if
(
result
)
{
if
(
result
)
{
...
...
pages/soil-sample-manage/sample-preparation/SoilItemNum.vue
View file @
da66a09b
...
@@ -11,9 +11,6 @@
...
@@ -11,9 +11,6 @@
<Col
span=
"24"
>
<Col
span=
"24"
>
</Col>
</Col>
<!--操作-->
<!--操作-->
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
class=
"contHide"
show-search-btn=
"true"
@
on-result-change=
"_btnClick"
></btn-list>
</Col>
<!-- 表格 -->
<!-- 表格 -->
<Col
span=
"24"
>
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
...
...
pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue
View file @
da66a09b
...
@@ -8,11 +8,8 @@
...
@@ -8,11 +8,8 @@
<Col
span=
"24"
>
<Col
span=
"24"
>
<Form
id=
"search-form"
:label-width=
"80"
v-show=
"searchOpen"
inline
onsubmit=
"return false"
>
<Form
id=
"search-form"
:label-width=
"80"
v-show=
"searchOpen"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"委托编号:"
>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.entrustCode"
name=
"entrustCode"
placeholder=
"请输入样品编号"
clearable
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"试样编号:"
>
<Form-item
class=
"search-item"
label=
"试样编号:"
>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.sampleCode"
name=
"sampleCode"
placeholder=
"请输入
样品名称
"
clearable
/>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.sampleCode"
name=
"sampleCode"
placeholder=
"请输入
试样编号
"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
...
...
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