common/setting.js
@@ -13,7 +13,7 @@ // devUrl: 'http://192.168.1.156:9528', // devUrl:'http://192.168.1.50:9528', // devUrl: 'http://192.168.0.102:9528', devUrl:'http://z4042833u6.wicp.vip', devUrl: 'https://srgdjczzxtpt.com:2080/api', minioBaseUrl: "http://60.220.177.113:9000/jczz/", // 数据中台接口url // dataCenterUrl: 'http://10.10.2.192/services', @@ -21,7 +21,7 @@ //洪水预报接口url hsybUrl: "https://sk.hubeishuiyi.cn/hsybApi/api/fh-admin", // 线上环境接口Url prodUrl: 'https://sk.hubeishuiyi.cn', prodUrl: 'https://srgdjczzxtpt.com:2080/api', // 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8 contentType: 'application/json;charset=UTF-8', // 后端返回状态码 @@ -37,4 +37,4 @@ // token过期时间（秒） // 30天 30*24*60*60 tokenTime: 2592000, } } main.js
@@ -2,8 +2,8 @@ import App from './App' import store from '@/store'; import boxTitle from '@/components/boxTitle/index.vue'; Vue.component('box-title', boxTitle) // // import boxTitle from '@/components/boxTitle/index.vue'; // Vue.component('box-title', boxTitle) // Vue.config.productionTip = false;
@@ -1,6 +1,6 @@ { "name" : "基层自治", "appid" : "__UNI__EE88272", "appid" : "__UNI__3081001", "description" : "", "versionName" : "1.0.10", "versionCode" : 104, @@ -142,7 +142,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { "appid" : "wxdc5675f4df850da6", "appid" : "wx1ff4bbc24b343ef1", "setting" : { "urlCheck" : false, "minified" : true, subPackage/article/list.vue
@@ -5,7 +5,7 @@ :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs> </view> <view class="list"> <view class="notic-list bgc-ff" v-for="(item,index) in noticeList" key="index" @click="navTo(item.id)"> <view class="notic-list bgc-ff" v-for="(item,index) in noticeList" :key="index" @click="navTo(item.id)"> <view class="f-28 mb-30"> {{item.title}} </view> @@ -143,4 +143,4 @@ padding: 30rpx; border-bottom: 1px solid #f5f5f5; } </style> </style> subPackage/bs/components/my-select.vue
subPackage/bs/views/bsReport.vue
@@ -66,7 +66,7 @@ </template> <script> import mySelect from "@/components/my-components/my-select.vue" import mySelect from "@/subPackage/bs/components/my-select.vue" import uploadMixin from "@/mixin/uploadMixin"; export default { components: { subPackage/house/components/boxTitle/index2.vue
File was renamed from components/boxTitle/index2.vue @@ -1,45 +1,45 @@ <template> <view class="box-title"> <view class="line"> </view> <view class="text"> {{ title }} </view> </view> </template> <script> export default { props: { title: { type: String, default: '' } }, data() { return { } } } </script> <style lang="scss" scoped> .box-title { <template> <view class="box-title"> <view class="line"> </view> <view class="text"> {{ title }} </view> </view> </template> <script> export default { props: { title: { type: String, default: '' } }, data() { return { } } } </script> <style lang="scss" scoped> .box-title { display: flex; align-items: center; color: #333; margin-bottom: 30rpx; .line { width: 6rpx; height: 30rpx; margin-right: 10rpx; background-color: #017BFC; margin-bottom: 30rpx; .line { width: 6rpx; height: 30rpx; margin-right: 10rpx; background-color: #017BFC; } .text { font-size: 32rpx; } } } } </style> subPackage/house/member/householdLabel.vue
@@ -41,7 +41,8 @@ <u-radio-group class="mt-40" v-model="labelValue" placement="row"> <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in labelList" :key="index" :label="item.name" :labelColor="item.color" :style="{color: item.color && '#fff'}" :name="item.name" :activeColor="item.color" @change="radioChange(item)"> :label="item.name" :labelColor="item.color" :style="{color: item.color && '#fff'}" :name="item.name" :activeColor="item.color" @change="radioChange(item)"> </u-radio> </u-radio-group> @@ -53,7 +54,7 @@ <script> import uploadMixin from "@/mixin/uploadMixin"; import newBoxTitle from '@/components/boxTitle/index2.vue' import newBoxTitle from '@/subPackage/house/components/boxTitle/index2.vue' import { getLabelListByParentId } from "@/api/label/label.js"; @@ -315,24 +316,26 @@ padding: 40rpx 30rpx; } .label-crad { background-color: #fff; margin-top: 20rpx; padding: 30rpx; .label-crad { background-color: #fff; margin-top: 20rpx; padding: 30rpx; border-radius: 8rpx; .label-btn-box { display: flex; flex-direction: row; flex-wrap: wrap; &>view { margin: 0 20rpx 20rpx 0; &>view { margin: 0 20rpx 20rpx 0; .u-button { padding: 6rpx 8rpx; border-width: 0 !important; background-color: #EFEFF0; color: #999999 !important; background-color: #EFEFF0; color: #999999 !important; } } } subPackage/house/roomControl/index.vue
@@ -37,8 +37,9 @@ <newBoxTitle title="房屋标签"></newBoxTitle> <view class="list"> <view v-for="(item, index) in labelBtnList" :key="index"> <u-button size="mini" type="primary" :style="{background: item.color, color: item.color && '#fff'}" :plain="true" :text="item.name" @click="showLabelPopup(item)"></u-button> <u-button size="mini" type="primary" :style="{background: item.color, color: item.color && '#fff'}" :plain="true" :text="item.name" @click="showLabelPopup(item)"></u-button> </view> </view> </view> @@ -46,7 +47,8 @@ </view> <view class="edit-btn"> <u-button type="primary" color="linear-gradient(163deg, #01BDFC 0%, #017BFC 100%)" text="修改数据" @click="updateHouseInfo(item)"></u-button> <u-button type="primary" color="linear-gradient(163deg, #01BDFC 0%, #017BFC 100%)" text="修改数据" @click="updateHouseInfo(item)"></u-button> </view> </view> @@ -59,7 +61,8 @@ <u-radio-group v-model="" class="mt-40" v-model="labelValue" placement="row"> <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in labelList" :key="index" :label="item.name" :labelColor="item.color" :name="item.name" :activeColor="item.color" @change="radioChange(item)"> :label="item.name" :labelColor="item.color" :name="item.name" :activeColor="item.color" @change="radioChange(item)"> </u-radio> </u-radio-group> @@ -77,10 +80,7 @@ <script> import uploadMixin from "@/mixin/uploadMixin"; import newBoxTitle from '@/components/boxTitle/index2.vue' import { uploadFile } from "@/api/doorplateAddress/doorplateAddress"; import newBoxTitle from '@/subPackage/house/components/boxTitle/index2.vue' import { getLabelListByParentId } from "@/api/label/label.js"; @@ -95,9 +95,6 @@ import { minioBaseUrl } from '@/common/setting' import { number } from "echarts"; export default { mixins: [uploadMixin], components: { @@ -181,8 +178,8 @@ labelValue: "", remark: '', // 标记 number: 0 number: 0 } }, created() { @@ -307,10 +304,10 @@ this.labelModelInfo.title = item.name this.currentLabelInfo = item // 遍历标签集合 this.labelList.forEach(e => { console.log(e.color,item.color); this.labelList.forEach(e => { console.log(e.color, item.color); if (e.color == item.color) { this.labelValue = e.name this.labelValue = e.name console.log(e); this.remark = item.remark this.number = 1 @@ -430,21 +427,25 @@ .label-btn-box { padding: 30rpx; margin-top: 20rpx; display: flex; display: flex; flex-direction: column; .list { display: flex; .list { display: flex; flex-wrap: wrap; &>view { &>view { width: calc((100% - 80rpx) / 5); margin: 0 20rpx 20rpx 0; &:nth-child(5n) { margin-right: 0; margin: 0 20rpx 20rpx 0; &:nth-child(5n) { margin-right: 0; } .u-button { padding: 6rpx 8rpx; border-width: 0 !important; background-color: #F5F5F5; border-width: 0 !important; background-color: #F5F5F5; color: #999999; } } @@ -461,7 +462,7 @@ justify-content: space-around; align-items: center; background: #fff; box-shadow: 0 2px 12px 0 rgba(0,0,0,.1); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1); } } } subPackage/workbench/components/boxTitle/index.vue
subPackage/workbench/views/bailReportDetail.vue
@@ -17,23 +17,23 @@ <view class="item mt-30"> <u-form labelPosition="left" :model="info" ref="form" labelWidth="100" :labelStyle="{fontSize:'28rpx'}"> <u-form-item label="审核结果" prop="confirmFlag" borderBottom @click="showPicker()"> <u-form labelPosition="left" :model="info" ref="form" labelWidth="100" :labelStyle="{fontSize:'28rpx'}"> <u-form-item label="审核结果" prop="confirmFlag" borderBottom @click="showPicker()"> <u-input v-model="confirmFlag" disabled disabledColor="#ffffff" border="none" placeholder="请输入" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="备注" borderBottom> <u-form-item label="备注" borderBottom> <u--input type="textarea" v-model="info.confirmNotion" :disabled="isDisabled" disabledColor="#ffffff" placeholderClass="f-28 c-99" border="none" inputAlign="right"></u--input> disabledColor="#ffffff" placeholderClass="f-28 c-99" border="none" inputAlign="right"></u--input> </u-form-item> <u-form-item label="审核人员" prop="checkUserName" borderBottom > <u-form-item label="审核人员" prop="checkUserName" borderBottom> <u-input v-model="info.confirmUserName" :disabled="isDisabled" disabledColor="#ffffff" border="none" placeholder="请输入审核人员姓名" placeholderClass="f-28 c-99" inputAlign="right"></u-input> </u-form-item> <u-form-item label="电话号码" prop="confirmUserTelephone" borderBottom > <u-form-item label="电话号码" prop="confirmUserTelephone" borderBottom> <u-input v-model="info.confirmUserTelephone" :disabled="isDisabled" disabledColor="#ffffff" border="none" placeholder="请输入审核人员电话号码" placeholderClass="f-28 c-99" inputAlign="right"></u-input> @@ -41,60 +41,54 @@ </u-form> </view> <view v-if="status == 2 && roleType == 2"> <u-subsection :list="tabList" :current="tabIndex" button-color="#017BFC" @change="changeTab"></u-subsection> <view v-if="status == 2 && roleType == 2"> <u-subsection :list="tabList" :current="tabIndex" button-color="#017BFC" @change="changeTab"></u-subsection> <u-form labelPosition="left" :model="goOutInfo" ref="form" labelWidth="100" :labelStyle="{fontSize:'28rpx'}"> <view class="" v-if="tabIndex == 0"> <u-form-item label="当前时间" prop="checkUserName" borderBottom @click="showPickerDate"> <u-input v-model="goOutInfo.startTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-form-item label="当前时间" prop="checkUserName" borderBottom @click="showPickerDate"> <u-input v-model="goOutInfo.startTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="报备位置" prop="checkUserName" borderBottom @click="getLocation('startLocation')"> <u-input v-model="goOutInfo.startLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-form-item label="报备位置" prop="checkUserName" borderBottom @click="getLocation('startLocation')"> <u-input v-model="goOutInfo.startLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> </view> <view class="" v-if="tabIndex == 1"> <u-form-item label="到达时间" prop="reachTime" borderBottom @click="showPickerDate"> <u-input v-model="goOutInfo.reachTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-form-item label="到达时间" prop="reachTime" borderBottom @click="showPickerDate"> <u-input v-model="goOutInfo.reachTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="到达位置" prop="reachLocation" borderBottom @click="getLocation('reachLocation')"> <u-input v-model="goOutInfo.reachLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-form-item label="到达位置" prop="reachLocation" borderBottom @click="getLocation('reachLocation')"> <u-input v-model="goOutInfo.reachLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> </view> <view class="" v-if="tabIndex == 2"> <u-form-item label="返回时间" prop="returnTime" borderBottom @click="showPickerDate"> <u-input v-model="goOutInfo.returnTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取返回时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-form-item label="返回时间" prop="returnTime" borderBottom @click="showPickerDate"> <u-input v-model="goOutInfo.returnTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取返回时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="返回位置" prop="returnLocation" borderBottom @click="getLocation('returnLocation')"> <u-input v-model="goOutInfo.returnLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取返回位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-form-item label="返回位置" prop="returnLocation" borderBottom @click="getLocation('returnLocation')"> <u-input v-model="goOutInfo.returnLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取返回位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> </view> </u-form> <view class="upload bgc-ff"> <view class="f-28 mb-20">位置图片</view> <view class="mt-20" v-if="tabIndex == 0"> <view class="mt-20" v-if="tabIndex == 0"> <u-upload :fileList="startImageUrls" :previewFullImage="uploadConfig.previewFullImage" :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'startImageUrls')" @delete="deletePic"> :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'startImageUrls')" @delete="deletePic"> <view class="upload-item upload-icon flex_base"> <u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon> </view> @@ -103,18 +97,18 @@ <view class="mt-20" v-if="tabIndex == 1"> <u-upload :fileList="reachImageUrls" :previewFullImage="uploadConfig.previewFullImage" :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'reachImageUrls')" @delete="deletePic"> :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'reachImageUrls')" @delete="deletePic"> <view class="upload-item upload-icon flex_base"> <u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon> </view> </view> </u-upload> </view> <view class="mt-20" v-if="tabIndex == 2"> <u-upload :fileList="returnImageUrls" :previewFullImage="uploadConfig.previewFullImage" :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'returnImageUrls')" @delete="deletePic"> :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'returnImageUrls')" @delete="deletePic"> <view class="upload-item upload-icon flex_base"> <u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon> </view> @@ -124,10 +118,10 @@ </view> <view class="bottom-btn" v-if="roleType == 1 && status == 1"> <view class="bottom-btn" v-if="roleType == 1 && status == 1"> <u-button type="primary" @click="submit">提交审核</u-button> </view> <view class="bottom-btn" v-if="roleType == 2 && status == 2"> <view class="bottom-btn" v-if="roleType == 2 && status == 2"> <u-button type="primary" @click="submit">提交</u-button> </view> <u-datetime-picker ref="datetimePicker" :show="showSelectDate" v-model="goOutDate[tabIndex]" mode="datetime" @@ -138,7 +132,7 @@ </template> <script> import boxTitle from '@/components/boxTitle/index.vue' import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue" import lineItem from '../components/lineItem.vue' import uploadMixin from "@/mixin/uploadMixin"; import { @@ -231,11 +225,11 @@ name: '返程时' } ], tabIndex:0, goOutDate:[new Date(),new Date(),new Date()], showSelectDate:false, status:1 ,//当前状态 1待审核 2审核通过 3审核不通过 id:"" tabIndex: 0, goOutDate: [new Date(), new Date(), new Date()], showSelectDate: false, status: 1, //当前状态 1待审核 2审核通过 3审核不通过 id: "" } }, @@ -256,60 +250,60 @@ }, methods: { changeTab(index){ changeTab(index) { this.tabIndex = index; }, showPickerDate(){ if(this.roleType == 2 && this.status != 2) return; showPickerDate() { if (this.roleType == 2 && this.status != 2) return; this.showSelectDate = true; }, cancelPickerDate(){ cancelPickerDate() { this.showSelectDate = false; }, showPicker(){ if(this.roleType == 2 && this.status != 2) return; showPicker() { if (this.roleType == 2 && this.status != 2) return; this.isPickerShow = true }, showConfirmFlag(status){ if(status == 1){ showConfirmFlag(status) { if (status == 1) { this.confirmFlag = "待审核" }else if(status == 2){ } else if (status == 2) { this.confirmFlag = "审核通过" }else { } else { this.confirmFlag = "审核不通过" } }, confirmDate(e) { this.showSelectDate = false; this.goOutDate[this.tabIndex] = e.value; if(this.tabIndex == 0){ if (this.tabIndex == 0) { this.goOutInfo.startTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss') }else if(this.tabIndex == 1){ } else if (this.tabIndex == 1) { this.goOutInfo.reachTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss') }else { } else { this.goOutInfo.returnTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss') } }, getLocation(key){ getLocation(key) { console.log(key) if(this.roleType == 2 && this.status != 2) return; if (this.roleType == 2 && this.status != 2) return; uni.chooseLocation({ success:(res)=>{ success: (res) => { console.log(res); this.$set(this.goOutInfo, key, res.address) }, complete:(err)=> { complete: (err) => { console.log(err) } }) }, async afterReadImgs(event, key) { this.showLoading() let lists = [].concat(event.file) @@ -341,7 +335,7 @@ this.status = data.confirmFlag this.id = data.id; this.showConfirmFlag(data.confirmFlag) if(data.confirmFlag != 1){ if (data.confirmFlag != 1) { this.info.confirmFlag = data.confirmFlag; this.info.confirmUserName = data.confirmUserName; this.info.confirmUserTelephone = data.confirmUserTelephone; @@ -366,7 +360,7 @@ this.info.confirmFlag = e.value[0].status; this.isPickerShow = false }, checkImages() { if (this.startImageUrls.length) { this.$set(this.goOutInfo, "startImageUrls", this.setGoOutImages(this.startImageUrls)) @@ -378,7 +372,7 @@ this.$set(this.goOutInfo, "returnImageUrls", this.setGoOutImages(this.returnImageUrls)) } }, setGoOutImages(key) { let urls = []; for (let i of key) { @@ -386,19 +380,19 @@ } return urls.join(",") }, submit() { if(this.roleType == 1){ if (this.roleType == 1) { this.submitRequest(this.info); }else{ } else { this.checkImages() setTimeout(()=>{ setTimeout(() => { this.submitRequest(this.goOutInfo); },1000) } }, 1000) } }, submitRequest(data){ submitRequest(data) { data.taskId = this.taskId; data.id = this.id; setBailReporting(data).then(res => { @@ -407,7 +401,7 @@ title: '更新失败', icon: 'error' }) }else { } else { uni.showToast({ title: '提交成功!', icon: 'success' @@ -469,17 +463,17 @@ /deep/ .uni-input-placeholder { font-size: 30rpx; } .upload { margin: 0 30rpx; padding: 30rpx; } .upload-item { width: 140rpx; height: 140rpx; border: 1px solid #EEEEEE; } </style> subPackage/workbench/views/editExamine.vue
@@ -56,7 +56,7 @@ getPlaceDetail } from '@/api/placeExp/placeExp.js' import uploadMixin from "@/mixin/uploadMixin"; import boxTtitle from '@/components/boxTitle/index.vue' import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue" import formItem from '../components/formItem.vue' export default { mixins: [uploadMixin], @@ -128,18 +128,18 @@ Object.keys(this.form).forEach(key => { this.form[key] = data[key] if (key === 'imageUrls' || key === 'planImageUrls') { this.form[key] = [] if (!!data[key]) { data[key] = JSON.parse(data[key]) if (Array.isArray(data[key])) { this.form[key] = data[key] } } else { this.form[key].push(data[key]) this.form[key] = [] if (!!data[key]) { data[key] = JSON.parse(data[key]) if (Array.isArray(data[key])) { this.form[key] = data[key] } } else { this.form[key].push(data[key]) } } }) }) console.log(this.form); this.personNum = placePractitioner.length this.$nextTick(() => { @@ -149,48 +149,48 @@ }) }) }) }, updatePlaceExt(data) { data['imageUrls'] = data['imageUrls'].join('、') data['planImageUrls'] = data['planImageUrls'].join('、') updatePlaceExtData({ ...data }).then(res => { const { code } = res if (code !== 200) { uni.showToast({ title: '提交失败', icon: 'error' }) return } uni.showToast({ title: '提交成功', icon: 'success', complete() { setTimeout(() => { uni.navigateBack() }, 1500) } }) }) }, addPerson() { this.personNum++ }, submit() { const placePractitioner = [] this.$refs.formItemRef.forEach(item => { item.form.placeId = this.form.placeId placePractitioner.push(item.form) }) this.form.placePractitioner = placePractitioner this.updatePlaceExt(this.form) }, pushPage() { this.$u.func.globalNavigator('/subPackage/workbench/views/cshw') }, updatePlaceExt(data) { data['imageUrls'] = data['imageUrls'].join('、') data['planImageUrls'] = data['planImageUrls'].join('、') updatePlaceExtData({ ...data }).then(res => { const { code } = res if (code !== 200) { uni.showToast({ title: '提交失败', icon: 'error' }) return } uni.showToast({ title: '提交成功', icon: 'success', complete() { setTimeout(() => { uni.navigateBack() }, 1500) } }) }) }, addPerson() { this.personNum++ }, submit() { const placePractitioner = [] this.$refs.formItemRef.forEach(item => { item.form.placeId = this.form.placeId placePractitioner.push(item.form) }) this.form.placePractitioner = placePractitioner this.updatePlaceExt(this.form) }, pushPage() { this.$u.func.globalNavigator('/subPackage/workbench/views/cshw') } } } subPackage/workbench/views/examine.vue
@@ -64,13 +64,14 @@ <view class="bottom-btn"> <u-button type="primary" @click="submit">提交审核</u-button> </view> <u-picker :defaultIndex="[this.defaultColumns]" :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker" :columns="columns" keyName="name" @cancel="isPickerShow = false" @confirm="handleConfirm"></u-picker> <u-picker :defaultIndex="[this.defaultColumns]" :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker" :columns="columns" keyName="name" @cancel="isPickerShow = false" @confirm="handleConfirm"></u-picker> </view> </template> <script> import boxTitle from '@/components/boxTitle/index.vue' import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue" import lineItem from '../components/lineItem.vue' import { checkPlaceExtData, @@ -132,8 +133,8 @@ currentData: { placeId: '', id: '' }, defaultColumns: 0, }, defaultColumns: 0, defaultPlaceholder: '' } }, @@ -170,10 +171,10 @@ }) this.basicData.forEach(item => { item.value = data[item.name] || '未完善' }) console.log(data); let columns = this.columns[0] this.defaultColumns = columns.findIndex(item => item.status == data.confirmFlag) }) console.log(data); let columns = this.columns[0] this.defaultColumns = columns.findIndex(item => item.status == data.confirmFlag) this.defaultPlaceholder = columns[this.defaultColumns].name this.placePersonList = data.placePractitioner }, subPackage/workbench/views/hotelReportDetail.vue
@@ -44,8 +44,8 @@ <view class="info"> <u-form labelWidth="70" :model="form" ref="form" class="form"> <u-form-item label="审核状态" @click="isPickerShow = true" class="form-item" :border-bottom="true"> <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态" :border="false"></u--input> <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态" :border="false"></u--input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="备注" class="form-item" v-if="selectStatus == 3"> @@ -54,7 +54,7 @@ </u-form> </view> </view> <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)"> <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)"> <u-button type="primary" @click="submit">提交审核</u-button> </view> <u-picker :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker" @@ -63,7 +63,7 @@ </template> <script> import boxTitle from '@/components/boxTitle/index.vue' import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue" import lineItem from '../components/lineItem.vue' import { getHotelReportingDetail, @@ -193,7 +193,7 @@ this.id = option.id; this.getDetailInfo(option.id); }, methods: { getDetailInfo(id) { @@ -238,7 +238,7 @@ }) return; } setHotelReporting(data).then(res=>{ setHotelReporting(data).then(res => { if (res.code !== 200) { uni.showToast({ title: '更新失败', @@ -255,23 +255,28 @@ <style lang="scss"> .container { padding:0 20rpx 130rpx; padding: 0 20rpx 130rpx; .box-title { margin-bottom: 15rpx; } .info { .title { font-size: 30rpx; padding-left: 10rpx; } .images-box { padding: 20rpx; min-height: 100rpx; background-color: #fff; } } .form { background-color: #fff; .form-item { padding: 0 20rpx;
@@ -27,8 +27,8 @@ <view class="info"> <u-form labelWidth="70" :model="form" ref="form" class="form"> <u-form-item label="审核状态" @click="isPickerShow = true" class="form-item" :border-bottom="true"> <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态" :border="false"></u--input> <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态" :border="false"></u--input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="备注" class="form-item" v-if="selectStatus == 3"> @@ -37,7 +37,7 @@ </u-form> </view> </view> <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)"> <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)"> <u-button type="primary" @click="submit">提交审核</u-button> </view> <u-picker :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker" @@ -46,7 +46,7 @@ </template> <script> import boxTitle from '@/components/boxTitle/index.vue' import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue" import lineItem from '../components/lineItem.vue' import { getLabelReportingDetail, @@ -108,8 +108,8 @@ currentId: '', currentData: {}, id: "", imageUrls:[], goodsImageUrls:[], imageUrls: [], goodsImageUrls: [], selectStatus: "", remark: "" } @@ -118,7 +118,7 @@ this.id = option.id; this.getDetailInfo(option.id); }, methods: { getDetailInfo(id) { getLabelReportingDetail({ @@ -159,7 +159,7 @@ }) return; } setLabelReporting(data).then(res=>{ setLabelReporting(data).then(res => { if (res.code !== 200) { uni.showToast({ title: '更新失败', @@ -176,23 +176,28 @@ <style lang="scss"> .container { padding:0 20rpx 130rpx; padding: 0 20rpx 130rpx; .box-title { margin-bottom: 15rpx; } .info { .title { font-size: 30rpx; padding-left: 10rpx; } .images-box { padding: 20rpx; min-height: 100rpx; background-color: #fff; } } .form { background-color: #fff; .form-item { padding: 0 20rpx;
