工作页面样式调整 新增车辆接口联调 上报诉求中增加重点事件标注

pages/login/login.vue

@@ -38,7 +38,7 @@ export default {
                 password: '',
 				app:'gov',
 				client:'h5',
-				customerId:'45687aa479955f9d06204d415238f7cc'
+				customerId:'1844965320640274433'
                 // appId: ''
             }
         };

pages/work2/work2.vue

@@ -13,34 +13,36 @@
                     <view class="list_1">
                         <view class="section_1-0">
                             <view class="text-wrapper_7-0">
-                                <text lines="1" class="text_2-0">居民信息</text>
+                                <text lines="1" class="text_2-0">基础信息</text>
                             </view>
                             <view class="content_1">
                                 <view>
                                     <image src="/static/images/work2/add_resident.png" class="image_12-0" @tap="onAddResident"></image>
                                     <text lines="1" class="text_3-0" @tap="onAddResident">新增居民信息</text>
                                 </view>
-                                <view>
-                                    <image src="/static/images/work2/add_record.png" class="image_13-0" @tap="onFollowUpList"></image>
-                                    <text lines="1" class="text_4-0">新增记录</text>
-                                </view>
-                            </view>
-                        </view>
-                        <view class="section_1-0">
-                            <view class="text-wrapper_7-0">
-                                <text lines="1" class="text_2-0">房屋信息</text>
-                            </view>
-                            <view class="content_1">
                                 <view>
                                     <image src="/static/images/work2/add_houses.png" class="image_12-1" @tap="onAddHouseLL"></image>
                                     <text lines="1" class="text_3-0">新增房屋信息</text>
                                 </view>
                                 <view>
-                                    <image src="/static/images/work2/add_record.png" class="image_13-1" @tap="onFollowUpLi"></image>
+                                    <image src="/static/images/work2/add_car.png" class="image_13-1" @tap="toCardManagement"></image>
-                                    <text lines="1" class="text_4-0">新增记录</text>
+                                    <text lines="1" class="text_4-0">新增车辆信息</text>
+                                </view>
+                                <view>
+                                    <image src="/static/images/work2/resi_record.png" class="image_13-0" @tap="onFollowUpList"></image>
+                                    <text lines="1" class="text_4-0">居民新增记录</text>
+                                </view>
+                                <view>
+                                    <image src="/static/images/work2/hose_record.png" class="image_13-1" @tap="onFollowUpLi"></image>
+                                    <text lines="1" class="text_4-0">房屋新增记录</text>
+                                </view>
+                                <view>
+                                    <image src="/static/images/work2/car_record.png" class="image_13-1" ></image>
+                                    <text lines="1" class="text_4-0">车辆新增记录</text>
                                 </view>
                             </view>
                         </view>
+                       
                         <view class="section_1-0">
                             <view class="text-wrapper_7-0">
                                 <text lines="1" class="text_2-0">为民服务</text>
@@ -179,7 +181,11 @@ export default {
                 url: '../../subpages/communitySelfInsp/pages/followUpList/followUpList?key1=resi'
             });
         },
-
+        toCardManagement() {
+            uni.navigateTo({
+                url: '../../subpages/carManagement/pages/add/add'
+            });
+        },
         onFollowUpLi() {
             uni.navigateTo({
                 url: '../../subpages/communitySelfInsp/pages/followUpList/followUpList?key1=house'
@@ -308,6 +314,7 @@ export default {
     display: flex;
     /* flex-direction: row; */
     justify-self: center;
+    flex-wrap: wrap;
     margin: 40rpx 0 0 10rpx;
 }
 .content_1 > view {
@@ -359,7 +366,6 @@ export default {
 .section_1-0 {
     background-color: rgba(255, 255, 255, 1);
     border-radius: 20rpx;
-    height: 292rpx;
     margin-bottom: 19rpx;
     width: 710rpx;
     display: flex;

subpages/carManagement/pages/add/add.vue

@@ -10,7 +10,7 @@
                 <view style="overflow-x: hidden;">
                     <jia-cascader :itemList="angencyList" :defaultItemList="defaultItemList"
                         @completeChange="completeGrid" @inputChange="change" :border="false"
-                        :clearIcon="false"></jia-cascader>
+                        :clearIcon="false" v-if="reset === 0" ></jia-cascader>
                 </view>
             </view>
             <view :class="'item  '">
@@ -91,8 +91,8 @@
                     <view class="field-text">购置日期</view>
                 </view>
                 <view hover-class="backC" class="value-dl" @tap="showTimePicker">
-                    <view :class="formData.acquistionDate ? 'di-name' : 'di-name1'">{{ formData.acquistionDate ?
+                    <view :class="timeStr ? 'di-name' : 'di-name1'">{{ timeStr ?
-                        formData.acquistionDate : '请选择' }}
+                        timeStr : '请选择' }}
                     </view>
                     <image class="di-but" src="/static/images/right.png" mode="aspectFit" />
                 </view>
@@ -109,9 +109,10 @@
             </view>
         </view>
         <view class="bot_btn">
-            <button type="default" :plain="true" class="bottom_btn bottom_btn_close" @tap="close">取消</button>
+            <button type="default" :plain="true" class="bottom_btn bottom_btn_close" @tap="backRouter">取消</button>
             <button type="primary" class="btn_bule bottom_btn" @tap="saveForm">提交</button>
         </view>
+        <u-toast ref="uToast"></u-toast>
     </view>
 </template>
 
@@ -131,6 +132,7 @@ export default {
             maxDate: null,
             angencyList: [],
             defaultItemList: [],
+            timeStr:'',
             formData: {
                 agencyId: '',//所属组织
                 orgNamePath: '',//所属组织名称路径
@@ -145,7 +147,8 @@ export default {
                 acquistionDate: '',//购置日期
                 carOwnerNum: '',//车主证件号
                 remark: ''//备注
-            }
+            },
+            reset:0
         };
     },
     /**
@@ -186,6 +189,9 @@ export default {
      */
     onShareAppMessage() { },
     methods: {
+        backRouter(){
+            uni.navigateBack()
+        },
         getAgencygridtree() {
             api.getAgencygridtree()
                 .then((res) => {
@@ -205,7 +211,7 @@ export default {
                 this.setData({
                 'formData.orgNamePath':e.result.map(item=>item.text).join(','),
                 'formData.orgIdPath':e.result.map(item=>item.value).join(','),
-                agencyId:e.result[e.result.length - 1].value
+                'formData.agencyId' :e.result[e.result.length - 1].value
                 })
             }
         },
@@ -238,18 +244,78 @@ export default {
             this.setData({
                 visibleTime: true,
                 maxDate: new Date().getTime(),
-                acquistionDate: new Date().getTime()
+                'formData.acquistionDate': new Date().getTime()
             });
         },
         onConfirmDate(e) {
+            console.log(e);
+            console.log(formatTime(e.value));
             this.setData({
                 visibleTime: false,
-                'formData.acquistionDate': formatTime(e.value)
+                'formData.acquistionDate':formatTime(e.value),
+                timeStr:formatTime(e.value)
             });
 
         },
+        showToast(params) {
+				this.$refs.uToast.show({
+					...params,
+					complete() {
+						params.url && uni.navigateTo({
+							url: params.url
+						})
+					}
+				})
+		},
         saveForm() {
-            console.log(this.formData);
+            if(!this.formData.agencyId){
+                this.showToast({message:'请选择所属组织'})
+                return false
+            }
+            if(!this.formData.carNumber){
+                this.showToast({message:'请输入车牌号码'})
+                return false
+            }
+            if(!this.formData.carOwnerName){
+                this.showToast({message:'请输入车主姓名'})
+                return false
+            }
+            if(!this.formData.carOwnerMobile){
+                this.showToast({message:'请输入车主电话'})
+                return false 
+            }
+            this.formData.acquistionDate = this.timeStr
+           api.carInfoSave(this.formData).then(res=>{//
+            if(res.code === 0){
+                let than = this
+                this.setData({
+                    formData:{ 
+                               agencyId: '',//所属组织
+                               orgNamePath: '',//所属组织名称路径
+                               carBrand: '',//车辆品牌
+                               carOwnerMobile: '',//车主电话
+                               carOwnerName: '',//车主姓名
+                               orgIdPath: '',//所属组织路径
+                               carNumber: '',//车牌号码
+                               customerId: '',//客户Id
+                               carColor: '',//车辆颜色
+                               carriersNum: 1,//核载人数
+                               acquistionDate: '',//购置日期
+                               carOwnerNum: '',//车主证件号
+                               remark: ''//备注
+                    },
+                    timeStr:null
+                })
+                setTimeout(()=>{
+                    than.setData({
+                        reset:0
+                    })
+                },100)
+                this.showToast({message:'新增成功'})
+            }
+           }).catch(err=>{
+            console.log(err);
+           })
         },
     }
 };

subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.vue

@@ -124,13 +124,26 @@
 										:clearIcon="false"></jia-cascader>
 								</view>
 							</view>
+							<view :class="'item  ' + (isDisabled ? 'disabled' : '')">
+								<view class="field">
+									<text class="must">*</text>
+									<view class="field-text">重点问题标注</view>
+								</view>
+								<view class="value-dl" @click="keyProblemShow = true">
+									<view :class="keyProblemStr ? 'pdi-name' : 'di-name1'">
+										{{ keyProblemStr ? keyProblemStr : '请选择' }}
+									</view>
+									<image class="di-but" src="/static/images/right.png" mode="aspectFit"/>
+								</view>
+							</view>
+							<u-picker :show="keyProblemShow" :columns="keyProblemList" @cancel="keyProblemShow = false"  @confirm="confirmKeyProblem"></u-picker>
 							<view :class="'item  ' + (isDisabled ? 'disabled' : '')">
 								<view class="field">
 									<text class="must">*</text>
 									<view class="field-text">{{ tabVal === '1' ? '需求时间' : '发生时间' }}</view>
 								</view>
 								<view class="value-dl" @tap="showTimePicker">
-									<view :class="agencyName ? 'di-name' : 'di-name1'">{{ showTime ? showTime : '请选择' }}
+									<view :class="showTime ? 'di-name' : 'di-name1'">{{ showTime ? showTime : '请选择' }}
 									</view>
 									<image class="di-but" src="/static/images/right.png" mode="aspectFit" />
 								</view>
@@ -436,6 +449,9 @@
 		},
 		data() {
 			return {
+				keyProblemShow:false,
+				keyProblemStr:'',
+				keyProblemList:[['违章拉客','违章停车']],
 				reportTypeListOrg: [],
 				measureLists: [],
 				measureData: [],
@@ -719,6 +735,12 @@
 		// /page/user?id=123
 		onShareAppMessage() {},
 		methods: {
+			confirmKeyProblem(e){
+				this.setData({
+					keyProblemShow:false,
+					keyProblemStr:e.value[0]
+				})
+			},
             uploadxfyun(){
                 const baseString  =  CryptoJS.SHA1(Md5.hashStr('e0810427' + Math.floor(Date.now() / 1000)),'d432ed34d99fc02d4608063a2fb22d49');
                 var base64 =  CryptoJS.enc.Base64.stringify(baseString); 
@@ -3090,7 +3112,7 @@
 		align-items: center;
 		display: flex;
 		justify-content: space-between;
-
+		margin:0 7px 0 20px ;
 		flex: 1;
 	}
 

utils/api.js

@@ -89,7 +89,8 @@ module.exports = {
     isUpdater,
     Enterpriseambiguity,
     hotResidentSearch,
-    hotHouseSearch
+    hotHouseSearch,
+    carInfoSave
 };
 
 // 获取公钥
@@ -478,3 +479,7 @@ function hotResidentSearch() {
 function hotHouseSearch() {
     return fly.post(`actual/base/communityHouse/hotHouseSearch`);
 }
+//新增车辆
+function carInfoSave(data) {
+    return fly.post(`epmetuser/carInfo/save`,data);
+}

utils/config.js

@@ -5,7 +5,7 @@ module.exports = {
 };
 function BASEURL() {
     // return 'https://epmet-test.elinkservice.cn/api/' // 测试环境
-    return 'http://192.168.1.144/api/'; //开发环境
+    return 'http://192.168.1.140/api/'; //开发环境
     // return 'https://epmet-preview.elinkservice.cn/api/' // 生产环境
     //return http://219.146.91.110:30801/api //开发外网
 }