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

zhy_new_1203
liujun 2024-12-04 20:08:47 +08:00
commit 04fdcb9a96
10 changed files with 22 additions and 21 deletions

View File

@ -4,8 +4,8 @@
<view class="container">
<u-checkbox-group v-model="selectValue" placement="column">
<u-checkbox :customStyle="{marginBottom: '8px'}" v-for="(item, index) in list" :key="index"
:label="type === 'assignments' ? item.TYPE_NAME : item.NAME"
:name="type === 'assignments' ? item.TYPE_NAME : item.NAME">
:label="type === 'assignments' ? item.ID : item.NAME"
:name="type === 'assignments' ? item.ID : item.NAME">
</u-checkbox>
</u-checkbox-group>
<view class="button_group_placeholder"></view>

View File

@ -175,8 +175,8 @@ export default {
BOARD_INSTALL_TIME: '',
WORK_END_DATE: '',
WORK_USER: '',
WORK_LONGITUDE: '1',
WORK_LATITUDE: '1',
WORK_LONGITUDE: '',
WORK_LATITUDE: '',
MEDIUM: '',
TEMPERATURE: '',
PRESSURE: '',
@ -304,8 +304,8 @@ export default {
}
})
},
fnSign(event) {
this.form.SIGN = event.filePath
fnSign({ path }) {
this.form.SIGN = path
},
async fnSubmit() {
try {

View File

@ -128,8 +128,8 @@ export default {
CORP_NAME: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
WORK_LONGITUDE: '1',
WORK_LATITUDE: '1',
WORK_LONGITUDE: '',
WORK_LATITUDE: '',
WORK_PLACE: '',
JOB_CONTENT: '',
WORK_CONTENT: '',

View File

@ -119,8 +119,8 @@ export default {
WORK_CONTENT: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
WORK_LONGITUDE: '1',
WORK_LATITUDE: '1',
WORK_LONGITUDE: '',
WORK_LATITUDE: '',
WORK_USER: '',
SPECIAL_WORK: '',
RISK_IDENTIFICATION: '',

View File

@ -128,8 +128,8 @@ export default {
CORP_NAME: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
WORK_LONGITUDE: '1',
WORK_LATITUDE: '1',
WORK_LONGITUDE: '',
WORK_LATITUDE: '',
OTHER_DEPT: '',
WORK_REASON: '',
WORK_CONTENT: '',

View File

@ -132,8 +132,8 @@ export default {
CORP_NAME: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
WORK_LONGITUDE: '1',
WORK_LATITUDE: '1',
WORK_LONGITUDE: '',
WORK_LATITUDE: '',
WORK_PLACE: '',
WORK_CONTENT: '',
WORK_USER: '',

View File

@ -121,8 +121,8 @@ export default {
WORK_CONTENT: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
WORK_LONGITUDE: '1',
WORK_LATITUDE: '1',
WORK_LONGITUDE: '',
WORK_LATITUDE: '',
SPECIAL_WORK: '',
RISK_IDENTIFICATION: '',
},

View File

@ -136,8 +136,8 @@ export default {
WORK_CONTENT: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
WORK_LONGITUDE: '1',
WORK_LATITUDE: '1',
WORK_LONGITUDE: '',
WORK_LATITUDE: '',
SPECIAL_WORK: '',
RISK_IDENTIFICATION: '',
},

View File

@ -43,8 +43,8 @@ export default {
{name: '纬度', key_name: 'WORK_LATITUDE', type: 0}
],
form: {
WORK_LONGITUDE: '1',
WORK_LATITUDE: '1'
WORK_LONGITUDE: '',
WORK_LATITUDE: ''
},
rules: {
WORK_LONGITUDE: [{type: 'string', required: true, message: '请输入经度', trigger: ['blur', 'change']}],

View File

@ -78,7 +78,8 @@ export default {
currentPage: this.currentPage,
TYPE: this.type,
vectors: '0',
REQUEST_SOURCE: '2'
REQUEST_SOURCE: '1',
DEPARTMENT_ID: this.$store.state.userInfo.DEPARTMENT_ID
});
this.list = [...this.list, ...resData.list.list];
this.totalPage = resData.list.totalPage;