Skip to content

P
patzn-cloud-web-back-soil
Commit 2a9d0f9f by wangweidong
Options

Merge remote-tracking branch 'origin/dev' into dev

parents f13b32c3 09e5759e
Showing with 166 additions and 91 deletions
api/soil/soil-entrust.js
......@@ -152,5 +152,18 @@ export default {
submitToInstock: data =>
http
.post('soil/v1/alone_sample/submit_to_out_storage', data)
.then(res => res),
// 登记历史记录
pageRegisterHis: data =>
http.post('soil/v1/alone_sample/page_register_his', data).then(res => res),
// 出库历史记录
pageWaitDeliveryHis: data =>
http
.post('soil/v1/alone_sample/page_wait_delivery_his', data)
.then(res => res),
// 入库历史记录
pageWaitStorageHis: data =>
http
.post('soil/v1/alone_sample/page_wait_storage_his', data)
.then(res => res)
}
api/soil/soil-sample.js
......@@ -254,5 +254,9 @@ export default {
pageWaitDelivery: data =>
http.post('soil/v1/alone_sample/page_wait_delivery', data).then(res => res),
outStorageSubmit: data =>
http.post('soil/v1/alone_sample/out_storage_submit', data).then(res => res)
http.post('soil/v1/alone_sample/out_storage_submit', data).then(res => res),
pageStorehouseSample: data =>
http
.post('soil/v1/alone_sample/page_storehouse_sample', data)
.then(res => res)
}
api/soil/soil-statistics.js
......@@ -47,5 +47,9 @@ export default {
pageGroupExpStatistics: data =>
http
.post('soil/v1/statistics/page_group_exp_statistics', data)
.then(res => res),
listExperimentProgress: data =>
http
.post('soil/v1/experiment/list_experiment_progress', data)
.then(res => res)
}
components/statistic/ProgressList.vue
......@@ -7,9 +7,10 @@
<div style="position: relative">
<label class="view-progress fl">
<!-- <Progress :percent="45" :stroke-width="20" status="active" text-inside />-->
<Progress :percent="30" status="active" hide-info></Progress>
<Progress :percent="state >= index ? 99.9: 0" status="active" hide-info></Progress>
<!-- <Progress :percent="30" status="active" hide-info></Progress>-->
</label>
<label :class="{'process-actives':state >= index}" class="progress-bg-gray fl process-actives">
<label :class="{'process-actives':state >= index}" class="progress-bg-gray fl">
<label class="progress-bg-white" style="display: inline-block;max-width: 100%;margin-bottom: 4px;font-weight: 700;"></label>
</label>
<div class="clear"></div>
......
pages/soil-alone-sample-instock/EntrustRegisterHis.vue
......@@ -8,11 +8,8 @@
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托商:">
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托单号" clearable/>
<Form-item class="search-item" label="项目名称:">
<Input v-model="formObj.projectName" @on-enter="_formSearch" name="projectName" placeholder="请输入项目名称" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -56,9 +53,10 @@
<script>
import { soilAptitude, soilEntrust } from '../../api'
import MeterEntrustRecord from '../../components/operation/Operation'
import ViewDetail from './ViewDetail'
export default {
// eslint-disable-next-line vue/no-unused-components
components: { MeterEntrustRecord },
components: { MeterEntrustRecord, ViewDetail },
data() {
return {
currentComponent: '',
......@@ -75,7 +73,7 @@ export default {
{
type: 'ios-list',
id: '',
name: '试样列表'
name: '查看'
},
{
type: 'ios-clock',
......@@ -90,20 +88,11 @@ export default {
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托商', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '委托日期', key: 'entrustDate', width: 120, date: true },
{ title: '钻孔位置', key: 'boreholeLocation', width: 120 },
{ title: '水深（米）', key: 'waterDepth', width: 120 },
{ title: '项目名称', key: 'projectName', width: 120 },
{ title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
{ 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 }
{ title: '箱数', key: 'casesNum', width: 120 },
{ title: '登记日期', key: 'registTime', width: 120, date: true }
]
}
},
......@@ -140,6 +129,9 @@ export default {
case '编辑':
this._editModal(true, data.id)
break
case '查看':
this._viewModal(true, data.id)
break
case '资质项目':
this._itemModal(data.id)
break
......@@ -161,6 +153,28 @@ export default {
}
})
},
_viewModal(edit, id) {
this.currentComponent = 'ViewDetail'
if (edit) {
this.$refs.pageTable._showLoading()
// 编辑
this._getDetailById(id)
} else {
// 添加
this.$nextTick(() => {
this.$refs.refModal._open()
})
}
},
_getDetailById: async function(id) {
const result = await soilEntrust.aloneSampleGetById(id)
if (result) {
this.$refs.refModal._open(result)
this.$refs.pageTable._hideLoading()
} else {
this.$refs.pageTable._hideLoading()
}
},
_sampleManage(data) {
// 管理样品
this.currentComponent = 'SoilSampleManage'
......@@ -189,7 +203,9 @@ export default {
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await soilEntrust.pageRegHis(this.formObj)
const result = await soilEntrust.pageWaitStorageHis(
this.$serializeForm(this.formObj)
)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......
pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegisterHis.vue
......@@ -8,11 +8,8 @@
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托商:">
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托单号" clearable/>
<Form-item class="search-item" label="项目名称:">
<Input v-model="formObj.projectName" @on-enter="_formSearch" name="projectName" placeholder="请输入项目名称" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -56,9 +53,10 @@
<script>
import { soilAptitude, soilEntrust } from '../../../api'
import MeterEntrustRecord from '../../../components/operation/Operation'
import ViewDetail from './ViewDetail'
export default {
// eslint-disable-next-line vue/no-unused-components
components: { MeterEntrustRecord },
components: { MeterEntrustRecord, ViewDetail },
data() {
return {
currentComponent: '',
......@@ -75,7 +73,7 @@ export default {
{
type: 'ios-list',
id: '',
name: '试样列表'
name: '查看'
},
{
type: 'ios-clock',
......@@ -90,20 +88,11 @@ export default {
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托商', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '委托日期', key: 'entrustDate', width: 120, date: true },
{ title: '钻孔位置', key: 'boreholeLocation', width: 120 },
{ title: '水深（米）', key: 'waterDepth', width: 120 },
{ title: '项目名称', key: 'projectName', width: 120 },
{ title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
{ 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 }
{ title: '箱数', key: 'casesNum', width: 120 },
{ title: '登记日期', key: 'registTime', width: 120, date: true }
]
}
},
......@@ -140,6 +129,9 @@ export default {
case '编辑':
this._editModal(true, data.id)
break
case '查看':
this._viewModal(true, data.id)
break
case '资质项目':
this._itemModal(data.id)
break
......@@ -161,6 +153,28 @@ export default {
}
})
},
_viewModal(edit, id) {
this.currentComponent = 'ViewDetail'
if (edit) {
this.$refs.pageTable._showLoading()
// 编辑
this._getDetailById(id)
} else {
// 添加
this.$nextTick(() => {
this.$refs.refModal._open()
})
}
},
_getDetailById: async function(id) {
const result = await soilEntrust.aloneSampleGetById(id)
if (result) {
this.$refs.refModal._open(result)
this.$refs.pageTable._hideLoading()
} else {
this.$refs.pageTable._hideLoading()
}
},
_sampleManage(data) {
// 管理样品
this.currentComponent = 'SoilSampleManage'
......@@ -189,7 +203,7 @@ export default {
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await soilEntrust.pageRegHis(this.formObj)
const result = await soilEntrust.pageWaitDeliveryHis(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......
pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManage.vue
......@@ -40,7 +40,6 @@
<div v-else-if="item.key==='classify'">
{{scope.row[item.key]===0?'判定依据':scope.row[item.key]===1?'检测依据':scope.row[item.key]===2?'其他':''}}
</div>
<div v-else-if="item.key==='type'">
{{scope.row[item.key]===0?'待检':scope.row[item.key]===1?'备样':scope.row[item.key]===2?'备用': ''}}
</div>
......@@ -92,11 +91,12 @@ export default {
],
// 表格
pageColumns: [
{ title: '库房号', key: 'warehouse' },
{ title: '货架号', key: 'name' },
{ title: '位置分类', key: 'type' },
{ title: '位置管理人', key: 'manager' },
{ title: '备注说明', key: 'remark' }
{ title: '钻孔名称', key: 'boreholeName' },
{ title: '项目负责人', key: 'projectLeader' },
{ title: '入库日期', key: 'instockTime', date: true },
{ title: '留存有效期', key: 'keepLimitTime', date: true },
{ title: '库房号', key: 'storehouse' },
{ title: '架位号', key: 'shelfCode' }
],
// 操作
iconMsg: [
......@@ -193,7 +193,7 @@ export default {
// 获取数据
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilSample.aloneWarehouseLocation(
const result = await soilSample.pageStorehouseSample(
this.$serializeForm(this.formObj)
)
if (result) {
......
pages/soil-alone-sample/EntrustRegister.vue
......@@ -8,9 +8,6 @@
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable/>
</Form-item>
<Form-item class="search-item" label="项目名称:">
<Input v-model="formObj.projectName" @on-enter="_formSearch" name="projectName" placeholder="请输入项目名称" clearable/>
</Form-item>
......
pages/soil-alone-sample/EntrustRegisterHis.vue
......@@ -8,11 +8,8 @@
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托商:">
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托单号" clearable/>
<Form-item class="search-item" label="项目名称:">
<Input v-model="formObj.projectName" @on-enter="_formSearch" name="projectName" placeholder="请输入项目名称" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -56,9 +53,10 @@
<script>
import { soilAptitude, soilEntrust } from '../../api'
import MeterEntrustRecord from '../../components/operation/Operation'
import ViewDetail from './ViewDetail'
export default {
// eslint-disable-next-line vue/no-unused-components
components: { MeterEntrustRecord },
components: { MeterEntrustRecord, ViewDetail },
data() {
return {
currentComponent: '',
......@@ -75,7 +73,7 @@ export default {
{
type: 'ios-list',
id: '',
name: '试样列表'
name: '查看'
},
{
type: 'ios-clock',
......@@ -90,20 +88,11 @@ export default {
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托商', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '委托日期', key: 'entrustDate', width: 120, date: true },
{ title: '钻孔位置', key: 'boreholeLocation', width: 120 },
{ title: '水深（米）', key: 'waterDepth', width: 120 },
{ title: '项目名称', key: 'projectName', width: 120 },
{ title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
{ 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 }
{ title: '箱数', key: 'casesNum', width: 120 },
{ title: '登记日期', key: 'registTime', width: 120, date: true }
]
}
},
......@@ -140,6 +129,9 @@ export default {
case '编辑':
this._editModal(true, data.id)
break
case '查看':
this._viewModal(true, data.id)
break
case '资质项目':
this._itemModal(data.id)
break
......@@ -161,6 +153,28 @@ export default {
}
})
},
_viewModal(edit, id) {
this.currentComponent = 'ViewDetail'
if (edit) {
this.$refs.pageTable._showLoading()
// 编辑
this._getDetailById(id)
} else {
// 添加
this.$nextTick(() => {
this.$refs.refModal._open()
})
}
},
_getDetailById: async function(id) {
const result = await soilEntrust.aloneSampleGetById(id)
if (result) {
this.$refs.refModal._open(result)
this.$refs.pageTable._hideLoading()
} else {
this.$refs.pageTable._hideLoading()
}
},
_sampleManage(data) {
// 管理样品
this.currentComponent = 'SoilSampleManage'
......@@ -189,7 +203,9 @@ export default {
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await soilEntrust.pageRegHis(this.formObj)
const result = await soilEntrust.pageRegisterHis(
this.$serializeForm(this.formObj)
)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......
pages/workbench/sample-progress/SampleProgress.vue
......@@ -41,7 +41,7 @@ export default {
contractId: '',
//
page: 0,
rows: 10,
rows: 50,
formObj: {},
processObj: {
height: document.documentElement.clientHeight - 300 + 'px'
......@@ -74,14 +74,24 @@ export default {
this.sampleInfo = []
}
Object.assign(this.formObj, this._searchParams())
const result = await soilStatistics.pageWaitEnd(this.formObj)
const result = await soilStatistics.listExperimentProgress(this.formObj)
if (result) {
const records = result.records
const pages = result.pages
// for (let i = 0; i < records.length; i++) {
// // 获取下标
// records[i].index = this.sampleProgressList.indexOf(records[i].index)
// }
for (let i = 0; i < records.length; i++) {
// 获取下标
if (records[i].auditTime) {
records[i].progressIndex = 3
} else if (records[i].checkTime) {
records[i].progressIndex = 2
} else if (records[i].testEndTime) {
records[i].progressIndex = 1
} else if (records[i].allotTime) {
records[i].progressIndex = 0
} else {
records[i].progressIndex = -1
}
}
// this.sampleInfo = records
this.sampleInfo = this.sampleInfo.concat(records)
this.$refs.myscrollfull.endByPage(this.sampleInfo.length, pages)
......
pages/workbench/sample-progress/SampleSteps.vue
......@@ -6,7 +6,7 @@
<Col span="6">
<ul class="progress-ul">
<li>
<div class="title">名称</div>
<div class="title">样品编号</div>
<div class="cont">
<a
:class="{
......@@ -16,17 +16,17 @@
'warning-color':itemInfo.queryType === 3
}"
style="font-weight: bold"
>{{itemInfo.client}}</a>
>{{itemInfo.sampleCode}}</a>
</div>
</li>
<li>
<div class="title">编号</div>
<div class="title">试验名称</div>
<div class="cont">
{{itemInfo.projectNo}}
{{itemInfo.name}}
</div>
</li>
<li>
<div class="title">钻孔名称</div>
<div class="title">钻孔编号</div>
<div class="cont">
{{itemInfo.boreholeName}}
</div>
......@@ -35,10 +35,10 @@
</Col>
<!--样品进度信息-->
<Col span="18">
<ProgressList :progressList="[{name:'已分配',time:itemInfo.signDate,user:itemInfo.signer},
{name:'检测完成',time:itemInfo.receiveDate,user:itemInfo.receiver},{name:'已复核',time:itemInfo.testDate,user:itemInfo.tester},
{name:'已校核',time:itemInfo.reportMakeDate,user:itemInfo.reportMaker}]"
:state="itemInfo.index"></ProgressList>
<ProgressList :progressList="[{name:'已分配',time:itemInfo.allotTime,user:itemInfo.alloter},
{name:'检测完成',time:itemInfo.testEndTime,user:itemInfo.testEnder},{name:'已复核',time:itemInfo.checkTime,user:itemInfo.checker},
{name:'已审核',time:itemInfo.auditTime,user:itemInfo.auditor}]"
:state="itemInfo.progressIndex"></ProgressList>
</Col>
</Row>
</div>
......
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