Merge remote-tracking branch 'origin/pet' into pet
commit
04fdcb9a96
|
@ -4,8 +4,8 @@
|
||||||
<view class="container">
|
<view class="container">
|
||||||
<u-checkbox-group v-model="selectValue" placement="column">
|
<u-checkbox-group v-model="selectValue" placement="column">
|
||||||
<u-checkbox :customStyle="{marginBottom: '8px'}" v-for="(item, index) in list" :key="index"
|
<u-checkbox :customStyle="{marginBottom: '8px'}" v-for="(item, index) in list" :key="index"
|
||||||
:label="type === 'assignments' ? item.TYPE_NAME : item.NAME"
|
:label="type === 'assignments' ? item.ID : item.NAME"
|
||||||
:name="type === 'assignments' ? item.TYPE_NAME : item.NAME">
|
:name="type === 'assignments' ? item.ID : item.NAME">
|
||||||
</u-checkbox>
|
</u-checkbox>
|
||||||
</u-checkbox-group>
|
</u-checkbox-group>
|
||||||
<view class="button_group_placeholder"></view>
|
<view class="button_group_placeholder"></view>
|
||||||
|
|
|
@ -175,8 +175,8 @@ export default {
|
||||||
BOARD_INSTALL_TIME: '',
|
BOARD_INSTALL_TIME: '',
|
||||||
WORK_END_DATE: '',
|
WORK_END_DATE: '',
|
||||||
WORK_USER: '',
|
WORK_USER: '',
|
||||||
WORK_LONGITUDE: '1',
|
WORK_LONGITUDE: '',
|
||||||
WORK_LATITUDE: '1',
|
WORK_LATITUDE: '',
|
||||||
MEDIUM: '',
|
MEDIUM: '',
|
||||||
TEMPERATURE: '',
|
TEMPERATURE: '',
|
||||||
PRESSURE: '',
|
PRESSURE: '',
|
||||||
|
@ -304,8 +304,8 @@ export default {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
fnSign(event) {
|
fnSign({ path }) {
|
||||||
this.form.SIGN = event.filePath
|
this.form.SIGN = path
|
||||||
},
|
},
|
||||||
async fnSubmit() {
|
async fnSubmit() {
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -128,8 +128,8 @@ export default {
|
||||||
CORP_NAME: '',
|
CORP_NAME: '',
|
||||||
WORK_START_DATE: '',
|
WORK_START_DATE: '',
|
||||||
WORK_END_DATE: '',
|
WORK_END_DATE: '',
|
||||||
WORK_LONGITUDE: '1',
|
WORK_LONGITUDE: '',
|
||||||
WORK_LATITUDE: '1',
|
WORK_LATITUDE: '',
|
||||||
WORK_PLACE: '',
|
WORK_PLACE: '',
|
||||||
JOB_CONTENT: '',
|
JOB_CONTENT: '',
|
||||||
WORK_CONTENT: '',
|
WORK_CONTENT: '',
|
||||||
|
|
|
@ -119,8 +119,8 @@ export default {
|
||||||
WORK_CONTENT: '',
|
WORK_CONTENT: '',
|
||||||
WORK_START_DATE: '',
|
WORK_START_DATE: '',
|
||||||
WORK_END_DATE: '',
|
WORK_END_DATE: '',
|
||||||
WORK_LONGITUDE: '1',
|
WORK_LONGITUDE: '',
|
||||||
WORK_LATITUDE: '1',
|
WORK_LATITUDE: '',
|
||||||
WORK_USER: '',
|
WORK_USER: '',
|
||||||
SPECIAL_WORK: '',
|
SPECIAL_WORK: '',
|
||||||
RISK_IDENTIFICATION: '',
|
RISK_IDENTIFICATION: '',
|
||||||
|
|
|
@ -128,8 +128,8 @@ export default {
|
||||||
CORP_NAME: '',
|
CORP_NAME: '',
|
||||||
WORK_START_DATE: '',
|
WORK_START_DATE: '',
|
||||||
WORK_END_DATE: '',
|
WORK_END_DATE: '',
|
||||||
WORK_LONGITUDE: '1',
|
WORK_LONGITUDE: '',
|
||||||
WORK_LATITUDE: '1',
|
WORK_LATITUDE: '',
|
||||||
OTHER_DEPT: '',
|
OTHER_DEPT: '',
|
||||||
WORK_REASON: '',
|
WORK_REASON: '',
|
||||||
WORK_CONTENT: '',
|
WORK_CONTENT: '',
|
||||||
|
|
|
@ -132,8 +132,8 @@ export default {
|
||||||
CORP_NAME: '',
|
CORP_NAME: '',
|
||||||
WORK_START_DATE: '',
|
WORK_START_DATE: '',
|
||||||
WORK_END_DATE: '',
|
WORK_END_DATE: '',
|
||||||
WORK_LONGITUDE: '1',
|
WORK_LONGITUDE: '',
|
||||||
WORK_LATITUDE: '1',
|
WORK_LATITUDE: '',
|
||||||
WORK_PLACE: '',
|
WORK_PLACE: '',
|
||||||
WORK_CONTENT: '',
|
WORK_CONTENT: '',
|
||||||
WORK_USER: '',
|
WORK_USER: '',
|
||||||
|
|
|
@ -121,8 +121,8 @@ export default {
|
||||||
WORK_CONTENT: '',
|
WORK_CONTENT: '',
|
||||||
WORK_START_DATE: '',
|
WORK_START_DATE: '',
|
||||||
WORK_END_DATE: '',
|
WORK_END_DATE: '',
|
||||||
WORK_LONGITUDE: '1',
|
WORK_LONGITUDE: '',
|
||||||
WORK_LATITUDE: '1',
|
WORK_LATITUDE: '',
|
||||||
SPECIAL_WORK: '',
|
SPECIAL_WORK: '',
|
||||||
RISK_IDENTIFICATION: '',
|
RISK_IDENTIFICATION: '',
|
||||||
},
|
},
|
||||||
|
|
|
@ -136,8 +136,8 @@ export default {
|
||||||
WORK_CONTENT: '',
|
WORK_CONTENT: '',
|
||||||
WORK_START_DATE: '',
|
WORK_START_DATE: '',
|
||||||
WORK_END_DATE: '',
|
WORK_END_DATE: '',
|
||||||
WORK_LONGITUDE: '1',
|
WORK_LONGITUDE: '',
|
||||||
WORK_LATITUDE: '1',
|
WORK_LATITUDE: '',
|
||||||
SPECIAL_WORK: '',
|
SPECIAL_WORK: '',
|
||||||
RISK_IDENTIFICATION: '',
|
RISK_IDENTIFICATION: '',
|
||||||
},
|
},
|
||||||
|
|
|
@ -43,8 +43,8 @@ export default {
|
||||||
{name: '纬度', key_name: 'WORK_LATITUDE', type: 0}
|
{name: '纬度', key_name: 'WORK_LATITUDE', type: 0}
|
||||||
],
|
],
|
||||||
form: {
|
form: {
|
||||||
WORK_LONGITUDE: '1',
|
WORK_LONGITUDE: '',
|
||||||
WORK_LATITUDE: '1'
|
WORK_LATITUDE: ''
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
WORK_LONGITUDE: [{type: 'string', required: true, message: '请输入经度', trigger: ['blur', 'change']}],
|
WORK_LONGITUDE: [{type: 'string', required: true, message: '请输入经度', trigger: ['blur', 'change']}],
|
||||||
|
|
|
@ -78,7 +78,8 @@ export default {
|
||||||
currentPage: this.currentPage,
|
currentPage: this.currentPage,
|
||||||
TYPE: this.type,
|
TYPE: this.type,
|
||||||
vectors: '0',
|
vectors: '0',
|
||||||
REQUEST_SOURCE: '2'
|
REQUEST_SOURCE: '1',
|
||||||
|
DEPARTMENT_ID: this.$store.state.userInfo.DEPARTMENT_ID
|
||||||
});
|
});
|
||||||
this.list = [...this.list, ...resData.list.list];
|
this.list = [...this.list, ...resData.list.list];
|
||||||
this.totalPage = resData.list.totalPage;
|
this.totalPage = resData.list.totalPage;
|
||||||
|
|
Loading…
Reference in New Issue