Skip to content

P
patzn-cloud-web-back-soil
Commit 409ed83d by lichengming
Options

修改了字段名称和新增菜单的接口

parent be35b033
Showing with 79 additions and 55 deletions
api/soil/soil-statistics.js
......@@ -102,6 +102,14 @@ export default {
http
.post('soil/v1/entrust/page_report_issue_by_summary_report', data)
.then(res => res),
pageStatistics: data =>
http.post('soil/v1/experiment/page_statistics', data).then(res => res),
pageAreaStatistics: data =>
http.post('soil/v1/statistics/page_area_statistics', data).then(res => res),
pageProjectStatistics: data =>
http
.post('soil/v1/statistics/page_project_statistics', data)
.then(res => res),
summaryReportIssueSubmit: data =>
http
.post('soil/v1/report/summary_report_issue_submit?ids=' + data)
......
pages/soil-alone-sample-instock/Instock.vue
......@@ -7,8 +7,8 @@
<Form-item @click.native="_storageModel()" label="库房号" prop="storehouse" style="width: 100%">
<Input v-model="formObj.storehouse" name="storehouse" placeholder="请输入库房号"/>
</Form-item>
<Form-item @click.native="_storageModel()" label="架位号" prop="shelfCode" style="width: 100%">
<Input v-model="formObj.shelfCode" name="shelfCode" placeholder="请输入架位号"/>
<Form-item @click.native="_storageModel()" label="货架号" prop="shelfCode" style="width: 100%">
<Input v-model="formObj.shelfCode" name="shelfCode" placeholder="请输入货架号"/>
</Form-item>
<Form-item label="入库人" prop="inStocker" style="width: 100%">
<Input v-model="formObj.inStocker" @click.native="_selectStaff" name="inStocker" readonly/>
......
pages/soil-alone-sample-manage/storehouse-place-manage/AddressManageEdit.vue
......@@ -97,7 +97,7 @@ export default {
warehouse: [
{ required: true, message: '库房号不能为空', trigger: 'blur' }
],
name: [{ required: true, message: '架位号不能为空', trigger: 'blur' }]
name: [{ required: true, message: '货架号不能为空', trigger: 'blur' }]
},
showEditModal: false,
classifyList: [
......
pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManage.vue
......@@ -14,8 +14,8 @@
<Form-item class="search-item" label="库房号:">
<Input @on-enter="_formSearch" v-model="formObj.storehouse" name="storehouse" placeholder="请输入库房号" clearable/>
</Form-item>
<Form-item class="search-item" label="架位号:">
<Input @on-enter="_formSearch" v-model="formObj.shelfCode" name="shelfCode" placeholder="请输入架位号" clearable/>
<Form-item class="search-item" label="货架号:">
<Input @on-enter="_formSearch" v-model="formObj.shelfCode" name="shelfCode" placeholder="请输入货架号" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -115,7 +115,7 @@ export default {
{ title: '入库日期', key: 'instockTime', date: true },
{ title: '留存有效期', key: 'keepLimitTime', date: true },
{ title: '库房号', key: 'storehouse' },
{ title: '架位号', key: 'shelfCode' }
{ title: '货架号', key: 'shelfCode' }
],
// 当前时间
currentTime: new Date().getTime(),
......
pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManageHis.vue
......@@ -17,8 +17,8 @@
<Form-item class="search-item" label="库房号:">
<Input @on-enter="_formSearch" v-model="formObj.warehouse" name="warehouse" placeholder="请输入库房号" clearable/>
</Form-item>
<Form-item class="search-item" label="架位号:">
<Input @on-enter="_formSearch" v-model="formObj.receiveLocation" name="receiveLocation" placeholder="请输入架位号" clearable/>
<Form-item class="search-item" label="货架号:">
<Input @on-enter="_formSearch" v-model="formObj.receiveLocation" name="receiveLocation" placeholder="请输入货架号" clearable/>
</Form-item>
<Form-item class="search-item" label="项目名称:">
<Input @on-enter="_formSearch" v-model="formObj.projectName" name="projectName" placeholder="请输入项目名称" clearable/>
......@@ -124,7 +124,7 @@ export default {
{ title: '现场编号', key: 'siteNo' },
{ title: '项目名称', key: 'projectName' },
{ title: '库房号', key: 'warehouse' },
{ title: '架位号', key: 'receiveLocation' },
{ title: '货架号', key: 'receiveLocation' },
{ title: '进度', key: 'progress', status: true }
],
// 操作
......
pages/soil-alone-sample-manage/storehouse-sample-manage/BatchModal.vue
......@@ -8,8 +8,8 @@
<Input v-model="formObj.storehouse" name="storehouse" placeholder="请输入库房号" style="width: 95%;"/>
<span @click="_storageModel()" style="font-size: 20px;color: #00b5ec">+</span>
</Form-item>
<Form-item label="架位号" prop="shelfCode " style="width: 100%">
<Input v-model="formObj.shelfCode " name="shelfCode" placeholder="请输入架位号"></Input>
<Form-item label="货架号" prop="shelfCode " style="width: 100%">
<Input v-model="formObj.shelfCode " name="shelfCode" placeholder="请输入货架号"></Input>
</Form-item>
</Form>
</div>
......
pages/soil-sample-manage/sample-alone-keep/entrust-sample-manage/KeepAdress.vue
......@@ -8,8 +8,8 @@
<Input v-model="formObj.warehouse" name="warehouse" placeholder="请选择库房号" style="width: 95%;"/>
<span @click="_storageModel()" style="font-size: 20px;color: #00b5ec">+</span>
</Form-item>
<Form-item label="架位号" prop="receiveLocation" style="width: 100%">
<Input v-model="formObj.receiveLocation" name="receiveLocation" placeholder="请选择架位号"/>
<Form-item label="货架号" prop="receiveLocation" style="width: 100%">
<Input v-model="formObj.receiveLocation" name="receiveLocation" placeholder="请选择货架号"/>
</Form-item>
<Form-item label="留存有效期：" prop="keepLimitTime" style="width: 100%">
<Date-picker v-model="formObj.keepLimitTime" @on-change="_ctimeChange" type="date" split-panels
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/KeepAdress.vue
......@@ -8,8 +8,8 @@
<Input v-model="formObj.warehouse" name="warehouse" placeholder="请选择库房号" style="width: 95%;"/>
<span @click="_storageModel()" style="font-size: 20px;color: #00b5ec">+</span>
</Form-item>
<Form-item label="架位号" prop="receiveLocation" style="width: 100%">
<Input v-model="formObj.receiveLocation" name="receiveLocation" placeholder="请选择架位号"/>
<Form-item label="货架号" prop="receiveLocation" style="width: 100%">
<Input v-model="formObj.receiveLocation" name="receiveLocation" placeholder="请选择货架号"/>
</Form-item>
<Form-item label="留存有效期：" prop="keepLimitTime" style="width: 100%">
<Date-picker v-model="formObj.keepLimitTime" @on-change="_ctimeChange" type="date" split-panels
......
pages/soil-statistics/area-sample/AreaSample.vue
......@@ -83,9 +83,7 @@ export default {
tester: '',
testerId: '',
pageColumns: [
{ title: '样品编号', key: 'tester', detail: true, width: 140 },
{ title: '样品名称', key: 'total', width: 100 },
{ title: '钻孔位置', key: 'doingTotal', width: 110 },
{ title: '钻孔位置', key: 'boreholeLocation', width: 110 },
{ title: '样品数量', key: 'endTotal', width: 110 }
],
groupData: [],
......@@ -97,8 +95,8 @@ export default {
endDate: nextMonth
},
formObj: {
edateBegin: undefined,
edateEnd: undefined
entrustDateBeg: undefined,
entrustDateEnd: undefined
},
testerData: [],
queryDate: [date, nextMonth],
......@@ -116,8 +114,11 @@ export default {
const str = this.tempData.endDate
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateBegin = this.tempData.beginDate
this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
this.formObj.entrustDateBeg = this.tempData.beginDate
this.formObj.entrustDateEnd = this.$dateformat(
lastday,
'yyyy-mm-dd HH:MM:ss'
)
this._getData()
},
methods: {
......@@ -125,16 +126,19 @@ export default {
if (data) {
this.tempData.beginDate = data[0]
this.tempData.endDate = data[1]
this.formObj.edateBegin = data[0]
this.formObj.entrustDateBeg = data[0]
const str = data[1]
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
this.formObj.entrustDateEnd = this.$dateformat(
lastday,
'yyyy-mm-dd HH:MM:ss'
)
} else {
this.tempData.beginDate = ''
this.tempData.endDate = ''
this.formObj.edateBegin = undefined
this.formObj.edateEnd = undefined
this.formObj.entrustDateBeg = undefined
this.formObj.entrustDateEnd = undefined
}
},
mGetDate(year, month) {
......@@ -143,8 +147,9 @@ export default {
},
// 服务类型
_getData: async function() {
const result = await soilStatistics.pagePersonalTaskStatistics(
this.formObj
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilStatistics.pageAreaStatistics(
this.$serializeFormSearch(this.formObj)
)
if (result) {
this.getPage = result
......
pages/soil-statistics/project-item/ProjectItem.vue
......@@ -88,10 +88,10 @@ export default {
tester: '',
testerId: '',
pageColumns: [
{ title: '样品编号', key: 'tester', detail: true, width: 140 },
{ title: '样品名称', key: 'total', width: 100 },
{ title: '钻孔位置', key: 'doingTotal', width: 110 },
{ title: '样品数量', key: 'endTotal', width: 110 }
{ title: '工程类型', key: 'projectType', detail: true, width: 140 },
{ title: '工程名称', key: 'projectName', width: 100 },
{ title: '检测项目', key: 'item', width: 110 },
{ title: '数量', key: 'count', width: 110 }
],
groupData: [],
getPage: {},
......@@ -102,8 +102,8 @@ export default {
endDate: nextMonth
},
formObj: {
edateBegin: undefined,
edateEnd: undefined,
entrustDateBeg: undefined,
entrustDateEnd: undefined,
projectType: undefined
},
testerData: [],
......@@ -123,8 +123,11 @@ export default {
const str = this.tempData.endDate
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateBegin = this.tempData.beginDate
this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
this.formObj.entrustDateBeg = this.tempData.beginDate
this.formObj.entrustDateEnd = this.$dateformat(
lastday,
'yyyy-mm-dd HH:MM:ss'
)
this._getData()
this._getProjectArray()
},
......@@ -143,16 +146,19 @@ export default {
if (data) {
this.tempData.beginDate = data[0]
this.tempData.endDate = data[1]
this.formObj.edateBegin = data[0]
this.formObj.entrustDateBeg = data[0]
const str = data[1]
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
this.formObj.entrustDateEnd = this.$dateformat(
lastday,
'yyyy-mm-dd HH:MM:ss'
)
} else {
this.tempData.beginDate = ''
this.tempData.endDate = ''
this.formObj.edateBegin = undefined
this.formObj.edateEnd = undefined
this.formObj.entrustDateBeg = undefined
this.formObj.entrustDateEnd = undefined
}
},
mGetDate(year, month) {
......@@ -161,8 +167,9 @@ export default {
},
// 服务类型
_getData: async function() {
const result = await soilStatistics.pagePersonalTaskStatistics(
this.formObj
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilStatistics.pageProjectStatistics(
this.$serializeFormSearch(this.formObj)
)
if (result) {
this.getPage = result
......
pages/soil-statistics/test-item/TestItem.vue
......@@ -22,7 +22,7 @@
</el-date-picker>
</Form-item>
<Form-item label="检测项目:">
<Input v-model="formObj.itemNames" @on-enter="_search" clearable placeholder="请输入检测项目" style="width:100%"/>
<Input v-model="formObj.name" @on-enter="_search" clearable placeholder="请输入检测项目" style="width:100%"/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_getData" type="primary" class="width-80">
......@@ -83,8 +83,8 @@ export default {
tester: '',
testerId: '',
pageColumns: [
{ title: '检测项目', key: 'total', width: 100 },
{ title: '数量', key: 'doingTotal', width: 110 }
{ title: '检测项目', key: 'name', width: 100 },
{ title: '数量', key: 'itemCount', width: 110 }
],
groupData: [],
getPage: {},
......@@ -95,8 +95,8 @@ export default {
endDate: nextMonth
},
formObj: {
edateBegin: undefined,
edateEnd: undefined
checkTimeBeg: undefined,
checkTimeEnd: undefined
},
testerData: [],
queryDate: [date, nextMonth],
......@@ -114,8 +114,8 @@ export default {
const str = this.tempData.endDate
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateBegin = this.tempData.beginDate
this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
this.formObj.checkTimeBeg = this.tempData.beginDate
this.formObj.checkTimeEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
this._getData()
},
methods: {
......@@ -123,16 +123,19 @@ export default {
if (data) {
this.tempData.beginDate = data[0]
this.tempData.endDate = data[1]
this.formObj.edateBegin = data[0]
this.formObj.checkTimeBeg = data[0]
const str = data[1]
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
this.formObj.checkTimeEnd = this.$dateformat(
lastday,
'yyyy-mm-dd HH:MM:ss'
)
} else {
this.tempData.beginDate = ''
this.tempData.endDate = ''
this.formObj.edateBegin = undefined
this.formObj.edateEnd = undefined
this.formObj.checkTimeBeg = undefined
this.formObj.checkTimeEnd = undefined
}
},
mGetDate(year, month) {
......@@ -141,8 +144,9 @@ export default {
},
// 服务类型
_getData: async function() {
const result = await soilStatistics.pagePersonalTaskStatistics(
this.formObj
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilStatistics.pageStatistics(
this.$serializeFormSearch(this.formObj)
)
if (result) {
this.getPage = result
......
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