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
374407ab
Commit
374407ab
authored
Apr 26, 2021
by
wangweidong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
土工试验Lims
parent
857b14ce
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
0 additions
and
235 deletions
+0
-235
ExperimentItemManage.vue
pages/meter-aptitude/item-manage/ExperimentItemManage.vue
+0
-11
SoilRecordEdit.vue
...il-alone-sample/in-out-template-manage/SoilRecordEdit.vue
+0
-29
SoilRecordEdit.vue
pages/soil-record-template-manage/SoilRecordEdit.vue
+0
-17
SoilReportEdit.vue
...eport-manage/soil-item-report-template/SoilReportEdit.vue
+0
-15
SoilReportEdit.vue
.../soil-report-manage/soil-summary-sheet/SoilReportEdit.vue
+0
-15
SoilRecordEdit.vue
...ample-manage/open-soil-template-manage/SoilRecordEdit.vue
+0
-15
SamplePreparation.vue
...ple-manage/sample-preparation-check/SamplePreparation.vue
+0
-18
SamplePreparationEdit.vue
...manage/sample-preparation-check/SamplePreparationEdit.vue
+0
-80
SamplePreparation.vue
...il-sample-manage/sample-preparation/SamplePreparation.vue
+0
-14
SamplePreparationEdit.vue
...ample-manage/sample-preparation/SamplePreparationEdit.vue
+0
-19
inspectionIngPanel.vue
pages/workbench/statistical-panel/inspectionIngPanel.vue
+0
-1
writeReportPanel.vue
pages/workbench/statistical-panel/writeReportPanel.vue
+0
-1
No files found.
pages/meter-aptitude/item-manage/ExperimentItemManage.vue
View file @
374407ab
...
...
@@ -172,18 +172,7 @@ export default {
this
.
$Message
.
warning
(
'暂无图片!'
)
}
},
_uploadPic
(
id
)
{
const
action
=
'/meter/v1/aptitude/upload_?aptitudeId='
+
id
const
data
=
{
importUrl
:
action
,
downloadUrl
:
''
,
title
:
'上传'
}
this
.
$refs
.
imageTemplateImport
.
_open
(
data
,
'上传图片'
)
},
_page
:
async
function
()
{
// this.$refs.pageTable._page('search-form-package', 'FoodJudgeBasis/page')
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
const
result
=
await
soilAptitude
.
page
(
this
.
formObj
)
if
(
result
)
{
...
...
pages/soil-alone-sample/in-out-template-manage/SoilRecordEdit.vue
View file @
374407ab
...
...
@@ -11,8 +11,6 @@
<div>
<Form
id=
"edit-form"
ref=
"formObj"
:model=
"formObj"
:rules=
"ruleValidate"
:label-width=
"95"
inline
class=
"inputBox"
>
<Form-item
label=
"类别"
prop=
"classType"
style=
"width: 100%"
>
<!--
<Input
v-model=
"formObj.classType"
@
on-keyup=
"_onKeyUp"
name=
"classType"
placeholder=
"请选择类别"
icon=
"plus-circled"
--
>
<!-- >
</Input>
-->
<el-select
v-model=
"formObj.classType"
placeholder=
"请选择类别"
size=
"small"
clearable
>
<el-option
:label=
"item.value"
:value=
"item.value"
v-for=
"(item,index) in typeList"
:key=
"index"
></el-option>
...
...
@@ -185,21 +183,6 @@ export default {
}
},
methods
:
{
_onKeyUp
()
{
if
(
this
.
formObj
.
alias
===
''
||
this
.
formObj
.
classType
===
''
)
{
this
.
isDisable
=
true
}
else
{
this
.
isDisable
=
false
this
.
action
=
global
.
baseURL
+
'/meter/v1/file_template/upload_template/?classType='
+
this
.
formObj
.
classType
+
'&alias='
+
this
.
formObj
.
alias
+
'&remark='
+
this
.
formObj
.
remark
}
},
channelInputLimit
(
e
)
{
const
key
=
e
.
key
// 不允许输入'e'和'.'
...
...
@@ -258,18 +241,6 @@ export default {
_handelprogress
(
event
,
file
,
fileList
)
{
this
.
isLoad
=
true
},
// _handelsuccess(response, file, fileList) {
// // 上传成功
// if (response.success) {
// this.isLoad = false
// this.$Message.success('上传成功!')
// this.$emit('on-result-change')
// this.showEditModal = false
// } else {
// this.isLoad = true
// this.$Message.error(response.msg)
// }
// },
_formatError
(
file
)
{
this
.
$Notice
.
error
({
title
:
'文件格式不正确'
,
...
...
pages/soil-record-template-manage/SoilRecordEdit.vue
View file @
374407ab
...
...
@@ -11,8 +11,6 @@
<div>
<Form
id=
"edit-form"
ref=
"formObj"
:model=
"formObj"
:rules=
"ruleValidate"
:label-width=
"95"
inline
class=
"inputBox"
>
<Form-item
label=
"类别"
prop=
"classType"
style=
"width: 100%"
>
<!--
<Input
v-model=
"formObj.classType"
@
on-keyup=
"_onKeyUp"
name=
"classType"
placeholder=
"请选择类别"
icon=
"plus-circled"
--
>
<!-- >
</Input>
-->
<el-select
v-model=
"formObj.classType"
placeholder=
"请选择类别"
size=
"small"
clearable
>
<el-option
:label=
"item.value"
:value=
"item.value"
v-for=
"(item,index) in typeList"
:key=
"index"
></el-option>
...
...
@@ -204,21 +202,6 @@ export default {
}
},
methods
:
{
_onKeyUp
()
{
if
(
this
.
formObj
.
alias
===
''
||
this
.
formObj
.
classType
===
''
)
{
this
.
isDisable
=
true
}
else
{
this
.
isDisable
=
false
this
.
action
=
global
.
baseURL
+
'/meter/v1/file_template/upload_template/?classType='
+
this
.
formObj
.
classType
+
'&alias='
+
this
.
formObj
.
alias
+
'&remark='
+
this
.
formObj
.
remark
}
},
channelInputLimit
(
e
)
{
const
key
=
e
.
key
// 不允许输入'e'和'.'
...
...
pages/soil-report-manage/soil-item-report-template/SoilReportEdit.vue
View file @
374407ab
...
...
@@ -152,21 +152,6 @@ export default {
}
},
methods
:
{
_onKeyUp
()
{
if
(
this
.
formObj
.
alias
===
''
||
this
.
formObj
.
classType
===
''
)
{
this
.
isDisable
=
true
}
else
{
this
.
isDisable
=
false
this
.
action
=
global
.
baseURL
+
'/meter/v1/file_template/upload_template/?classType='
+
this
.
formObj
.
classType
+
'&alias='
+
this
.
formObj
.
alias
+
'&remark='
+
this
.
formObj
.
remark
}
},
channelInputLimit
(
e
)
{
const
key
=
e
.
key
// 不允许输入'e'和'.'
...
...
pages/soil-report-manage/soil-summary-sheet/SoilReportEdit.vue
View file @
374407ab
...
...
@@ -150,21 +150,6 @@ export default {
}
},
methods
:
{
_onKeyUp
()
{
if
(
this
.
formObj
.
alias
===
''
||
this
.
formObj
.
classType
===
''
)
{
this
.
isDisable
=
true
}
else
{
this
.
isDisable
=
false
this
.
action
=
global
.
baseURL
+
'/meter/v1/file_template/upload_template/?classType='
+
this
.
formObj
.
classType
+
'&alias='
+
this
.
formObj
.
alias
+
'&remark='
+
this
.
formObj
.
remark
}
},
channelInputLimit
(
e
)
{
const
key
=
e
.
key
// 不允许输入'e'和'.'
...
...
pages/soil-sample-manage/open-soil-template-manage/SoilRecordEdit.vue
View file @
374407ab
...
...
@@ -185,21 +185,6 @@ export default {
}
},
methods
:
{
_onKeyUp
()
{
if
(
this
.
formObj
.
alias
===
''
||
this
.
formObj
.
classType
===
''
)
{
this
.
isDisable
=
true
}
else
{
this
.
isDisable
=
false
this
.
action
=
global
.
baseURL
+
'/meter/v1/file_template/upload_template/?classType='
+
this
.
formObj
.
classType
+
'&alias='
+
this
.
formObj
.
alias
+
'&remark='
+
this
.
formObj
.
remark
}
},
channelInputLimit
(
e
)
{
const
key
=
e
.
key
// 不允许输入'e'和'.'
...
...
pages/soil-sample-manage/sample-preparation-check/SamplePreparation.vue
View file @
374407ab
...
...
@@ -55,7 +55,6 @@
</template>
<
script
>
import
{
soilEntrust
}
from
'../../../api'
import
http
from
'../../../api/http'
import
Operation
from
'../../../components/operation/Operation'
import
global
from
'../../../api/config'
import
SampleManage
from
'./SampleManage'
...
...
@@ -117,12 +116,8 @@ export default {
{
title
:
'水深(米)'
,
key
:
'waterDepth'
,
width
:
120
},
{
title
:
'钻孔名称'
,
key
:
'boreholeName'
,
width
:
120
},
{
title
:
'进度'
,
key
:
'progress'
,
width
:
120
,
status
:
true
},
// { title: '平均容重', key: 'projectNo', width: 120 },
// { title: '报告编号', key: 'reportCode', width: 120 },
{
title
:
'制表日期'
,
key
:
'tabulateDate'
,
width
:
120
,
date
:
true
},
{
title
:
'制表人'
,
key
:
'tabulater'
,
width
:
120
},
// { title: '批准日期', key: 'approveDate', width: 120, date: true },
// { title: '批准人', key: 'approver', width: 120 },
{
title
:
'检验类别'
,
key
:
'testType'
,
width
:
120
}
]
}
...
...
@@ -178,9 +173,6 @@ export default {
case
'附件'
:
this
.
_upload
(
data
.
id
)
break
case
'导出委托单'
:
this
.
_exportEntrust
(
data
.
id
)
break
case
'删除'
:
this
.
_deleteByIds
([
data
.
id
])
break
...
...
@@ -340,16 +332,6 @@ export default {
})
// 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
)
{
const
result
=
await
soilEntrust
.
getVOById
(
id
)
if
(
result
)
{
...
...
pages/soil-sample-manage/sample-preparation-check/SamplePreparationEdit.vue
View file @
374407ab
...
...
@@ -58,11 +58,6 @@
sortable
>
<template
slot-scope=
"scope"
>
<!--
<div
v-if=
"item.key==='sampleCode'"
@
click
.
stop=
"_handleRow(scope)"
>
-->
<!--
<el-input
v-model=
"scope.row.name"
blur
placeholder=
"请输入或选择样品名称"
style=
"width: 150px;"
--
>
<!-- >
</el-input>
-->
<!--
<a
@
on-result-change=
"_judgeBasisChange"
@
click=
"_selectjudgeBasis(scope.$rowIndex)"
style=
"font-size: 18px;"
class=
""
>
+
</a>
-->
<!--
</div>
-->
<div
v-if=
"item.key==='siteNo'"
@
click
.
stop=
"_handleRow(scope)"
>
<el-input
v-model=
"scope.row.siteNo"
blur
placeholder=
"请输入现场编号"
></el-input>
...
...
@@ -346,9 +341,6 @@ export default {
case
'导入试验项目'
:
this
.
_importItem
()
break
case
'导入'
:
this
.
_importSample
()
break
case
'search'
:
this
.
searchOpen
=
!
this
.
searchOpen
break
...
...
@@ -402,47 +394,6 @@ export default {
_tabulateChange
(
data
)
{
this
.
formObj
.
tabulateDate
=
data
},
_odateChange
(
data
)
{
this
.
formObj
.
odate
=
data
},
_judgeBasisChange
(
msg
,
data
)
{
switch
(
msg
)
{
case
'select'
:
this
.
formObj
.
stdId
=
data
.
id
this
.
formObj
.
code
=
data
.
stdNum
this
.
formObj
.
name
=
data
.
name
this
.
$refs
.
formObj
.
validateField
(
'code'
)
break
case
'query'
:
this
.
formObj
.
stdId
=
''
this
.
formObj
.
code
=
data
.
stdNum
this
.
formObj
.
name
=
''
this
.
_getJudgeBasisList
(
data
.
stdNum
)
break
case
'focus'
:
this
.
_getJudgeBasisList
()
break
case
'blur'
:
if
(
this
.
formObj
.
stdId
===
''
)
{
this
.
formObj
.
code
=
''
this
.
_getJudgeBasisList
()
}
this
.
$refs
.
formObj
.
validateField
(
'code'
)
}
},
_selectjudgeBasis
(
index
)
{
console
.
log
(
index
)
this
.
index
=
index
this
.
$refs
.
EditModal
.
_open
()
},
_selectverification
(
index
)
{
console
.
log
(
index
)
this
.
index
=
index
this
.
$refs
.
VerificationModal
.
_open
()
},
_selectcontractCode
()
{
this
.
$refs
.
ContractModal
.
_open
()
},
_backData
(
data
)
{
this
.
$forceUpdate
()
console
.
log
(
typeof
this
.
index
)
...
...
@@ -455,28 +406,6 @@ export default {
console
.
log
(
'返回的数据'
,
data
)
console
.
log
(
this
.
getPage
.
records
)
},
_backContract
(
data
)
{
this
.
formObj
.
client
=
data
.
client
this
.
formObj
.
operation
.
person
=
data
.
person
this
.
formObj
.
operation
.
tel
=
data
.
tel
this
.
formObj
.
operation
.
fax
=
data
.
fax
if
(
data
.
province
)
{
this
.
testedCityData
=
[
data
.
province
,
data
.
city
,
data
.
county
]
this
.
formObj
.
province
=
data
.
province
this
.
formObj
.
city
=
data
.
city
this
.
formObj
.
county
=
data
.
county
}
this
.
formObj
.
street
=
data
.
street
this
.
formObj
.
entrustDate
=
new
Date
(
data
.
entrustDate
)
this
.
formObj
.
odate
=
new
Date
(
data
.
odate
)
this
.
formObj
.
contractCode
=
data
.
salesCode
this
.
formObj
.
operation
.
fee
=
data
.
discountPrice
if
(
data
.
sampleQuoteList
)
{
this
.
getPage
.
records
=
data
.
sampleQuoteList
}
else
{
this
.
getPage
.
records
=
[]
}
},
_backVerification
(
data
)
{
this
.
$forceUpdate
()
this
.
getPage
.
records
[
this
.
index
].
verification
=
data
.
verification
...
...
@@ -493,15 +422,6 @@ export default {
this
.
getPage
.
records
.
unshift
(
data
)
},
_importSample
()
{
const
data
=
{
importUrl
:
'/meter/v1/sample/import_sample_pre'
,
downloadUrl
:
'/meter/v1/excel/template/MeterSampleImport'
,
title
:
'导入'
}
this
.
$refs
.
importModal
.
_open
(
data
,
'样品导入'
)
},
_tableResultChange
(
msg
,
data
,
selData
)
{
switch
(
msg
)
{
case
'selectIds'
:
...
...
pages/soil-sample-manage/sample-preparation/SamplePreparation.vue
View file @
374407ab
...
...
@@ -58,7 +58,6 @@
</template>
<
script
>
import
{
soilEntrust
,
soilSample
}
from
'../../../api'
import
http
from
'../../../api/http'
import
Operation
from
'../../../components/operation/Operation'
import
CreateReport
from
'./CreateReport'
import
SampleManage
from
'./SampleManage'
...
...
@@ -216,9 +215,6 @@ export default {
case
'附件'
:
this
.
_upload
(
data
.
id
)
break
case
'导出委托单'
:
this
.
_exportEntrust
(
data
.
id
)
break
case
'删除'
:
this
.
_deleteByIds
([
data
.
id
])
break
...
...
@@ -450,16 +446,6 @@ export default {
})
// 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
)
{
const
result
=
await
soilEntrust
.
getVOById
(
id
)
if
(
result
)
{
...
...
pages/soil-sample-manage/sample-preparation/SamplePreparationEdit.vue
View file @
374407ab
...
...
@@ -190,12 +190,6 @@ export default {
id
:
''
,
name
:
'导入试验项目'
}
// ,
// {
// type: 'success',
// id: '',
// name: '导入'
// }
],
options
:
[
{
...
...
@@ -346,9 +340,6 @@ export default {
case
'导入试验项目'
:
this
.
_importItem
()
break
case
'导入'
:
this
.
_importSample
()
break
case
'search'
:
this
.
searchOpen
=
!
this
.
searchOpen
break
...
...
@@ -492,16 +483,6 @@ export default {
}
this
.
getPage
.
records
.
unshift
(
data
)
},
_importSample
()
{
const
data
=
{
importUrl
:
'/meter/v1/sample/import_sample_pre'
,
downloadUrl
:
'/meter/v1/excel/template/MeterSampleImport'
,
title
:
'导入'
}
this
.
$refs
.
importModal
.
_open
(
data
,
'样品导入'
)
},
_tableResultChange
(
msg
,
data
,
selData
)
{
switch
(
msg
)
{
case
'selectIds'
:
...
...
pages/workbench/statistical-panel/inspectionIngPanel.vue
View file @
374407ab
...
...
@@ -50,7 +50,6 @@ export default {
methods
:
{
toSendTask
()
{
this
.
$router
.
push
(
'/meter/test/send_sample_input'
)
// window.location.href = '/meter/test/send_sample_input'
},
_request
:
async
function
()
{
// type 请求 0:当天 1:本周 2:本月
...
...
pages/workbench/statistical-panel/writeReportPanel.vue
View file @
374407ab
...
...
@@ -50,7 +50,6 @@ export default {
methods
:
{
_toWrite
()
{
this
.
$router
.
push
(
'/meter/certificate/certificate_make'
)
// window.location.href = '/meter/certificate/certificate_make'
},
_request
:
async
function
()
{
// type 请求 0:当天 1:本周 2:本月
...
...
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