报修人的mphone改为phone

assets/js/controllers/customform/customformCtrl.js

@@ -11118,12 +11118,12 @@ appFormly.config(function config(formlyConfigProvider) {
                       scope.$parent.$parent.$parent.model.incident.contacts =
                         selectedItem.name;
                       if (
-                        selectedItem.mphone &&
-                        selectedItem.mphone != null &&
-                        selectedItem.mphone != ""
+                        selectedItem.phone &&
+                        selectedItem.phone != null &&
+                        selectedItem.phone != ""
                       ) {
                         scope.$parent.$parent.$parent.model.incident.contactsInformation =
-                          selectedItem.mphone;
+                          selectedItem.phone;
                       } else {
                         scope.$parent.$parent.$parent.model.incident.contactsInformation =
                           selectedItem.telephone;
@@ -13916,15 +13916,15 @@ appFormly.config(function config(formlyConfigProvider) {
                   var paramsModel = JSON.parse($stateParams.model)
                   //来电-添加报修人-回显电话
                   if (paramsModel.model.incident.requester.hjzxPhone) {
-                    $scope.requester.mphone = paramsModel.model.incident.requester.hjzxPhone;
+                    $scope.requester.phone = paramsModel.model.incident.requester.hjzxPhone;
                   }
                 }
                 $scope.onChangeadd = function (searchData) {
                   $scope.searchKey = searchData.account;
                   // $scope.searchDataadd = searchData;
                   var requesdata = angular.copy(searchData);
-                  if (requesdata.mphone) {
-                    delete requesdata.mphone;
+                  if (requesdata.phone) {
+                    delete requesdata.phone;
                   }
                   $scope.requester = requesdata;
                   console.log($scope.requester);
@@ -14149,9 +14149,9 @@ appFormly.config(function config(formlyConfigProvider) {
                   ) {
                     SweetAlert.swal("人员类型未填!", "请填写人员类型", "error");
                   } else if (
-                    angular.isUndefined($scope.requester.mphone) ||
-                    $scope.requester.mphone == null ||
-                    $scope.requester.mphone == ""
+                    angular.isUndefined($scope.requester.phone) ||
+                    $scope.requester.phone == null ||
+                    $scope.requester.phone == ""
                   ) {
                     SweetAlert.swal(
                       "报修人联系电话未填!",
@@ -14260,12 +14260,12 @@ appFormly.config(function config(formlyConfigProvider) {
 
                         options.model.contacts = selectedItem.name;
                         if (
-                          selectedItem.mphone &&
-                          selectedItem.mphone != null &&
-                          selectedItem.mphone != ""
+                          selectedItem.phone &&
+                          selectedItem.phone != null &&
+                          selectedItem.phone != ""
                         ) {
                           options.model.contactsInformation =
-                            selectedItem.mphone;
+                            selectedItem.phone;
                         } else {
                           options.model.contactsInformation =
                             selectedItem.telephone;
@@ -14394,7 +14394,7 @@ appFormly.config(function config(formlyConfigProvider) {
                   gender: modeldata.requester.gender,
                   email: modeldata.requester.email,
                   deptName: modeldata.requester.deptName,
-                  mphone: modeldata.requester.mphone,
+                  phone: modeldata.requester.phone,
                   telephone: modeldata.requester.telephone,
                   studentNo: modeldata.requester.studentNo,
                   areaDTO: modeldata.requester.areaDTO,
@@ -14405,8 +14405,8 @@ appFormly.config(function config(formlyConfigProvider) {
                   console.log(searchData);
                   $scope.searchKey = searchData.account;
                   var requesdata = angular.copy(searchData);
-                  if (requesdata.mphone) {
-                    delete requesdata.mphone;
+                  if (requesdata.phone) {
+                    delete requesdata.phone;
                   }
                   $scope.requester = requesdata;
                 };
@@ -14589,11 +14589,11 @@ appFormly.config(function config(formlyConfigProvider) {
                     }
                     options.model.contacts = selectedItem.name;
                     if (
-                      selectedItem.mphone &&
-                      selectedItem.mphone != null &&
-                      selectedItem.mphone != ""
+                      selectedItem.phone &&
+                      selectedItem.phone != null &&
+                      selectedItem.phone != ""
                     ) {
-                      options.model.contactsInformation = selectedItem.mphone;
+                      options.model.contactsInformation = selectedItem.phone;
                     } else {
                       options.model.contactsInformation =
                         selectedItem.telephone;
@@ -14802,7 +14802,7 @@ appFormly.config(function config(formlyConfigProvider) {
                       enableFiltering: false,
                     },
                     {
-                      name: "mphone",
+                      name: "phone",
                       displayName: "电话",
                       width: 100,
                       enableFiltering: false,
@@ -14977,12 +14977,12 @@ appFormly.config(function config(formlyConfigProvider) {
                     }
                     $scope.model.incident.contacts = selectedItem.name;
                     if (
-                      selectedItem.mphone &&
-                      selectedItem.mphone != null &&
-                      selectedItem.mphone != ""
+                      selectedItem.phone &&
+                      selectedItem.phone != null &&
+                      selectedItem.phone != ""
                     ) {
                       $scope.model.incident.contactsInformation =
-                        selectedItem.mphone;
+                        selectedItem.phone;
                     } else {
                       $scope.model.incident.contactsInformation =
                         selectedItem.telephone;
@@ -15240,7 +15240,7 @@ appFormly.config(function config(formlyConfigProvider) {
             });
             if (!$scope.options.model.contactsInformation) {
               $scope.options.model.contactsInformation =
-                $scope.model.requester.mphone;
+                $scope.model.requester.phone;
             }
           }
           if ($scope.roleidcode) {
@@ -15296,11 +15296,11 @@ appFormly.config(function config(formlyConfigProvider) {
             }
             $scope.model.incident.contacts = searchData.name;
             if (
-              searchData.mphone &&
-              searchData.mphone != null &&
-              searchData.mphone != ""
+              searchData.phone &&
+              searchData.phone != null &&
+              searchData.phone != ""
             ) {
-              $scope.model.incident.contactsInformation = searchData.mphone;
+              $scope.model.incident.contactsInformation = searchData.phone;
             } else {
               $scope.model.incident.contactsInformation = searchData.telephone;
             }
@@ -22033,7 +22033,7 @@ appFormly.controller("CustomformCtrl", [
               place: bxr.place,
               houseNumber: bxr.houseNumber,
               contacts: bxr.name,
-              contactsInformation: bxr.mphone,
+              contactsInformation: bxr.phone,
               // 'category': data.wxIncidentClassifyDTO.category,
               description: incidentDescription,
               source: {

assets/js/controllers/desk/recordCtrl.js

@@ -381,9 +381,9 @@ app.controller("recordCtrl", [
             });
             modalInstance.result.then(function (selectedItem) {
               if (selectedItem) {
-                if (selectedItem.telephone && !selectedItem.mphone) {
-                  selectedItem.telephone = angular.copy(selectedItem.mphone);
-                  delete selectedItem.mphone;
+                if (selectedItem.telephone && !selectedItem.phone) {
+                  selectedItem.telephone = angular.copy(selectedItem.phone);
+                  delete selectedItem.phone;
                 }
                 var data = {
                   requester: selectedItem,
@@ -399,7 +399,7 @@ app.controller("recordCtrl", [
                           incident: {
                             requester: response.data,
                             houseNumber: response.data.houseNumber,
-                            contactsInformation: response.data.mphone,
+                            contactsInformation: response.data.phone,
                             source: { id: 1548 },
                           },
                         },
@@ -423,7 +423,7 @@ app.controller("recordCtrl", [
                 incident: {
                   requester: myData.list[0],
                   houseNumber: myData.list[0].houseNumber,
-                  contactsInformation: myData.list[0].mphone,
+                  contactsInformation: myData.list[0].phone,
                   source: { id: 1548 },
                 },
               },
@@ -453,7 +453,7 @@ app.controller("recordCtrl", [
                       incident: {
                         requester: requester,
                         houseNumber: requester.houseNumber,
-                        contactsInformation: requester.mphone,
+                        contactsInformation: requester.phone,
                         source: { id: 1548 },
                       },
                     },

assets/js/controllers/mainCtrl.js

@@ -812,7 +812,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
     //                                             if (response.cdrid) {
     //                                                 var cdrid = response.cdrid;
     //                                                 // var response={cdrid:'219023836'}
-    //                                                 var filterData = { "idx": 0, "sum": 10, "requester": { "mphone": $rootScope.phone, "telephone": $rootScope.phone, "selectType": 1 } }
+    //                                                 var filterData = { "idx": 0, "sum": 10, "requester": { "phone": $rootScope.phone, "telephone": $rootScope.phone, "selectType": 1 } }
     //                                                 api_user_data.fetchDataList('requester', filterData).then(function(data) {
     //                                                     var myData = Restangular.stripRestangular(data);
     //                                                     // $rootScope.phone="";
@@ -826,8 +826,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
     //                                                                     $scope.searchKey = searchData.account;
     //                                                                     // $scope.searchDataadd = searchData;
     //                                                                     var requesdata = angular.copy(searchData)
-    //                                                                         // if (requesdata.mphone) {
-    //                                                                         //     delete requesdata.mphone;
+    //                                                                         // if (requesdata.phone) {
+    //                                                                         //     delete requesdata.phone;
     //                                                                         // }
     //                                                                     if (requesdata.telephone) {
     //                                                                         delete requesdata.telephone;
@@ -841,8 +841,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
     //                                                                 }
     //                                                                 $scope.getMydata = function(x) {
     //                                                                     var reqestdatap = JSON.parse(x[0])
-    //                                                                         // if ($scope.requester.mphone) {
-    //                                                                         //     delete reqestdatap.mphone;
+    //                                                                         // if ($scope.requester.phone) {
+    //                                                                         //     delete reqestdatap.phone;
     //                                                                         // }
     //                                                                     if ($scope.requester.telephone) {
     //                                                                         delete reqestdatap.telephone;
@@ -881,7 +881,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
     //                                                                     });
     //                                                                 }
     //                                                                 // if ((/^1[34578]\d{9}$/.test($rootScope.phone))) {
-    //                                                                 //     $scope.requester = { 'mphone': $rootScope.phone };
+    //                                                                 //     $scope.requester = { 'phone': $rootScope.phone };
     //                                                                 // } else {
     //                                                                 //     $scope.requester = { 'telephone': $rootScope.phone };
     //                                                                 // }
@@ -897,9 +897,9 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
     //                                                         });
     //                                                         modalInstance.result.then(function(selectedItem) {
     //                                                             if (selectedItem) {
-    //                                                                 if (selectedItem.telephone && !selectedItem.mphone) {
-    //                                                                     selectedItem.telephone = angular.copy(selectedItem.mphone);
-    //                                                                     delete selectedItem.mphone;
+    //                                                                 if (selectedItem.telephone && !selectedItem.phone) {
+    //                                                                     selectedItem.telephone = angular.copy(selectedItem.phone);
+    //                                                                     delete selectedItem.phone;
     //                                                                 }
     //                                                                 var data = {
     //                                                                     'requester': selectedItem
@@ -1112,8 +1112,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                                                                         $scope.searchKey = searchData.account;
                                                                         // $scope.searchDataadd = searchData;
                                                                         var requesdata = angular.copy(searchData)
-                                                                            // if (requesdata.mphone) {
-                                                                            //     delete requesdata.mphone;
+                                                                            // if (requesdata.phone) {
+                                                                            //     delete requesdata.phone;
                                                                             // }
                                                                         if (requesdata.telephone) {
                                                                             delete requesdata.telephone;
@@ -1127,8 +1127,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                                                                     }
                                                                     $scope.getMydata = function(x) {
                                                                         var reqestdatap = JSON.parse(x[0])
-                                                                            // if ($scope.requester.mphone) {
-                                                                            //     delete reqestdatap.mphone;
+                                                                            // if ($scope.requester.phone) {
+                                                                            //     delete reqestdatap.phone;
                                                                             // }
                                                                         if ($scope.requester.telephone) {
                                                                             delete reqestdatap.telephone;
@@ -1225,7 +1225,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                                                                         // $modalInstance.close($scope.requester);
                                                                         if (angular.isUndefined($scope.requester.name) || $scope.requester.name == null || $scope.requester.name == "") {
                                                                             SweetAlert.swal("报修人姓名未填!", "请填写报修人姓名", "error");
-                                                                        } else if (angular.isUndefined($scope.requester.mphone) || $scope.requester.mphone == null || $scope.requester.mphone == "") {
+                                                                        } else if (angular.isUndefined($scope.requester.phone) || $scope.requester.phone == null || $scope.requester.phone == "") {
                                                                             SweetAlert.swal("报修人电话未填!", "请填写报修人电话", "error");
                                                                         } else {
                                                                             $modalInstance.close($scope.requester);
@@ -1240,9 +1240,9 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                                                             });
                                                             modalInstance.result.then(function(selectedItem) {
                                                                 if (selectedItem) {
-                                                                    if (selectedItem.telephone && !selectedItem.mphone) {
-                                                                        selectedItem.telephone = angular.copy(selectedItem.mphone);
-                                                                        delete selectedItem.mphone;
+                                                                    if (selectedItem.telephone && !selectedItem.phone) {
+                                                                        selectedItem.telephone = angular.copy(selectedItem.phone);
+                                                                        delete selectedItem.phone;
                                                                     }
                                                                     var data = {
                                                                         'requester': selectedItem
@@ -1466,8 +1466,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                           $scope.searchKey = searchData.account;
                           // $scope.searchDataadd = searchData;
                           var requesdata = angular.copy(searchData)
-                          // if (requesdata.mphone) {
-                          //     delete requesdata.mphone;
+                          // if (requesdata.phone) {
+                          //     delete requesdata.phone;
                           // }
                           if (requesdata.telephone) {
                             delete requesdata.telephone;
@@ -1481,8 +1481,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                         }
                         $scope.getMydata = function (x) {
                           var reqestdatap = JSON.parse(x[0])
-                          // if ($scope.requester.mphone) {
-                          //     delete reqestdatap.mphone;
+                          // if ($scope.requester.phone) {
+                          //     delete reqestdatap.phone;
                           // }
                           if ($scope.requester.telephone) {
                             delete reqestdatap.telephone;
@@ -1587,14 +1587,14 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                         $scope.ok = function () {
                           var reg1 = /^1[3456789][0-9]{9}$/; //手机号
                           var reg2 = /^((0\d{2,3})-)*(\d{7,8})(-(\d{3,}))?$/; //座机号
-                          var flag1 = reg1.test($scope.requester.mphone);
-                          var flag2 = reg2.test($scope.requester.mphone);
+                          var flag1 = reg1.test($scope.requester.phone);
+                          var flag2 = reg2.test($scope.requester.phone);
                           console.log($scope.requester)
                           if (angular.isUndefined($scope.requester.name) || $scope.requester.name == null || $scope.requester.name == "") {
                             SweetAlert.swal("报修人姓名未填!", "请填写报修人姓名", "error");
                           } else if (angular.isUndefined($scope.requester.requesterType)) {
                             SweetAlert.swal("人员类型未填!", "请填写人员类型", "error");
-                          } else if (angular.isUndefined($scope.requester.mphone) || $scope.requester.mphone == null || $scope.requester.mphone == "") {
+                          } else if (angular.isUndefined($scope.requester.phone) || $scope.requester.phone == null || $scope.requester.phone == "") {
                             SweetAlert.swal("报修人电话未填!", "请填写报修人电话", "error");
                           }
                           else {
@@ -1609,9 +1609,9 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                     });
                     modalInstance.result.then(function (selectedItem) {
                       if (selectedItem) {
-                        if (selectedItem.telephone && !selectedItem.mphone) {
-                          selectedItem.telephone = angular.copy(selectedItem.mphone);
-                          delete selectedItem.mphone;
+                        if (selectedItem.telephone && !selectedItem.phone) {
+                          selectedItem.telephone = angular.copy(selectedItem.phone);
+                          delete selectedItem.phone;
                         }
                         var data = {
                           'requester': selectedItem
@@ -2307,7 +2307,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                 //     model: {
                 //       incident: {
                 //         requester: requesters[0],
-                //         contactsInformation: requesters[0].mphone,
+                //         contactsInformation: requesters[0].phone,
                 //         sockid: $rootScope.sockid
                 //       },
                 //     }
@@ -2346,7 +2346,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                         //     model: {
                         //       incident: {
                         //         requester: item,
-                        //         contactsInformation: item.mphone,
+                        //         contactsInformation: item.phone,
                         //         sockid: $rootScope.sockid
                         //       },
                         //     }
@@ -2415,7 +2415,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             //           model: {
             //             incident: {
             //               requester: requesters[0],
-            //               contactsInformation: requesters[0].mphone,
+            //               contactsInformation: requesters[0].phone,
             //               sockid: $rootScope.sockid
             //             },
             //           }
@@ -2443,7 +2443,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             //                   model: {
             //                     incident: {
             //                       requester: item,
-            //                       contactsInformation: item.mphone,
+            //                       contactsInformation: item.phone,
             //                       sockid: $rootScope.sockid
             //                     },
             //                   }
@@ -4719,7 +4719,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                 closeOnCancel: true
               }, function (isConfirm) {
                   if (isConfirm) {
-                    $scope.incidentModel.contactsInformation = newVal.mphone;
+                    $scope.incidentModel.contactsInformation = newVal.phone;
                   }
               });
             }

assets/js/controllers/means/meansoutCtrl.js

@@ -476,11 +476,11 @@ app.controller('meansapplyListCtrl', ["$scope", "$http", "i18nService", "$rootSc
                         { name: "影响度", value: data.influence.name },
                         { name: "优先级", value: data.priority.name }
                     ];
-                    $scope.printrequest['requester'] = [{ nameone: "用户姓名", valueone: data.requester.name, nametwo: "联系电话", valuetwo: data.requester.mphone },
+                    $scope.printrequest['requester'] = [{ nameone: "用户姓名", valueone: data.requester.name, nametwo: "联系电话", valuetwo: data.requester.phone },
                         { nameone: "故障地点", valueone: data.place.place, nametwo: "申报时间", valuetwo: data.responseTime }
                     ];
                     // $scope.printrequest['requester']=[{name:"用户姓名",value:data.requester.name},
-                    //                                   {name:"联系电话",value:data.requester.mphone},
+                    //                                   {name:"联系电话",value:data.requester.phone},
                     //                                   {name:"故障地点",value:data.place.place},
                     //                                   {name:"申报时间",value:data.responseTime}];
                     $scope.printrequest['incident'] = [{ nameone: "故障工单", valueone: data.incidentsign, nametwo: "故障分类", valuetwo: data.category.category }];

assets/js/controllers/system/thirdPartyCompanyCtrl.js

@@ -77,7 +77,7 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
             enableFiltering: false
         },
         {
-            name: 'mphone',
+            name: 'phone',
             displayName: '联系人电话',
             width: '20%',
             minWidth: '120',
@@ -119,7 +119,7 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
             categoryTypeIds: data.categoryTypeIds,//故障现象
             contacts: data.contacts,//联系人
             id: data.id,//id
-            mphone: data.mphone,//联系电话
+            phone: data.phone,//联系电话
             name: data.name,//公司名称
             startTime: data.startTime,//开始时间
             endTime: data.endTime,//结束时间

assets/js/controllers/system/user/adminrequesterCtrl.js

@@ -91,7 +91,7 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
             enableFiltering: false
         },
         {
-            name: 'mphone',
+            name: 'phone',
             displayName: '电话',
             width: '12%',
             minWidth: '125',
@@ -309,7 +309,7 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
                         "name": data.name,
                         "gender": data.gender,
                         "email": data.email,
-                        "mphone": data.mphone,
+                        "phone": data.phone,
                         "deptName": data.deptName,
                         "telephone": data.telephone,
                         "dept": data.dept,
@@ -333,7 +333,7 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
                         "name": data.name,
                         "gender": data.gender,
                         "email": data.email,
-                        "mphone": data.mphone,
+                        "phone": data.phone,
                         "deptName": data.deptName,
                         "telephone": data.telephone,
                         "dept": data.dept,

assets/views/createincident.html

@@ -21,7 +21,7 @@
                             <tr ng-repeat="item in requester" ng-click="choice(item)">
                                 <td>{{item.account}}</td>
                                 <td>{{item.name}}</td>
-                                <td>{{item.mphone }}</td>
+                                <td>{{item.phone }}</td>
                                 <td>{{item.telephone}}</td>
                                 <td>{{item.email}}</td>
                                 <td>{{item.deptName}}</td>
@@ -33,7 +33,7 @@
         </div>
     </div>
     <!-- <div class="well well-lg"><br/>
-     
+
     </div>  -->
     <!-- <div class="panel-footer text-center">
         <a ng-click="requester(worktimedata)"   data-dismiss="modal" class="btn btn-primary">保存</a>

assets/views/customform/tpl/modal-add-callrequester.html

@@ -49,10 +49,10 @@
                 </div>
             </div>
             <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14" for="mphone">联系电话*:</div>
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14" for="phone">联系电话*:</div>
                 <div class="pull-right openaddinput">
-                    <input style="width:270px;float: left;" class="form-control" id="mphone" name="mphone" ng-model="requester.mphone" placeholder="联系电话" />
-                    <span ng-click="requester.mphone=requester.telephone" style="float: left;width:68px;background-color: #fff;height:30px;border:1px solid #ccc;border-radius: 5px;text-align: center;line-height: 30px;font-size: 14px;cursor: pointer;">来电替换</span>
+                    <input style="width:270px;float: left;" class="form-control" id="phone" name="phone" ng-model="requester.phone" placeholder="联系电话" />
+                    <span ng-click="requester.phone=requester.telephone" style="float: left;width:68px;background-color: #fff;height:30px;border:1px solid #ccc;border-radius: 5px;text-align: center;line-height: 30px;font-size: 14px;cursor: pointer;">来电替换</span>
                 </div>
             </div>
             <div class="margin-bottom-15 anline">

assets/views/customform/tpl/modal-add-requester.html

@@ -66,7 +66,7 @@
 			<label for="telephone" class="col-md-3 col-md-offset-1 control-label">
 				电话
 			</label>
-			<input type="text" class="col-md-7" ng-model="requester.mphone" placeholder="输入手机号"   id="mphone">
+			<input type="text" class="col-md-7" ng-model="requester.phone" placeholder="输入手机号"   id="phone">
 		</div>-->
         <div class="row form-group">
             <label class="col-md-3 col-md-offset-1 control-label" for="email">性别:</label>
@@ -99,9 +99,9 @@
             </div>
         </div>
         <div class="row form-group">
-            <label class="col-md-3 col-md-offset-1 control-label" for="mphone">电话1*:</label>
+            <label class="col-md-3 col-md-offset-1 control-label" for="phone">电话1*:</label>
             <div class="col-md-7">
-                <input class="form-control" id="mphone" name="mphone" ng-model="requester.mphone" placeholder="电话" />
+                <input class="form-control" id="phone" name="phone" ng-model="requester.phone" placeholder="电话" />
             </div>
         </div>
         <div class="row form-group">

assets/views/customform/tpl/modal-change-requester.html

@@ -50,9 +50,9 @@
                 </div>
             </div> -->
             <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14" for="mphone">联系电话*:</div>
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14" for="phone">联系电话*:</div>
                 <div class="pull-right openaddinput">
-                    <input class="form-control" id="mphone" name="mphone" ng-model="requester.mphone" placeholder="电话" />
+                    <input class="form-control" id="phone" name="phone" ng-model="requester.phone" placeholder="电话" />
                 </div>
             </div>
             <div class="margin-bottom-15 anline">

assets/views/customform/tpl/selector.html

@@ -4,7 +4,7 @@
 </script>
 
 <script type="text/ng-template" id="selector/demo/browserWithIcon">
-	<img ng-src="{{option.icon}}"> 工号：{{option.account}}姓名：{{option.name}}性别：{{option.gender}}座机：{{option.telephone}}邮箱：{{option.email}}科室：{{option.deptName}}手机：{{option.mphone}}
+	<img ng-src="{{option.icon}}"> 工号：{{option.account}}姓名：{{option.name}}性别：{{option.gender}}座机：{{option.telephone}}邮箱：{{option.email}}科室：{{option.deptName}}手机：{{option.phone}}
 </script>
 <select selector
 	multi="false"
@@ -17,31 +17,31 @@
 
 
 <div class="panel">
-    <div class="panel-body" style="padding:0px;margin-top:10px">   
+    <div class="panel-body" style="padding:0px;margin-top:10px">
             <div class="input-group col-xs-12">
                 <div class="col-xs-3">
                     <a ng-click="phone(myBrowsers)" tooltip="工号" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>{{}}
                 </div>
                 <div class="col-xs-3">
-                    <a ng-click="phone(mphone)" tooltip="姓名" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers.mphone"></code>
+                    <a ng-click="phone(phone)" tooltip="姓名" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers.phone"></code>
                 </div>
                 <div class="col-xs-3">
-                    <a ng-click="phone(mphone)" tooltip="手机" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
+                    <a ng-click="phone(phone)" tooltip="手机" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
                 </div>
                 <div class="col-xs-3">
-                    <a ng-click="phone(mphone)" tooltip="性别" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
+                    <a ng-click="phone(phone)" tooltip="性别" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
                 </div>
                 <div class="col-xs-3">
-                    <a ng-click="phone(mphone)" tooltip="座机" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
+                    <a ng-click="phone(phone)" tooltip="座机" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
                 </div>
                 <div class="col-xs-3">
-                    <a ng-click="phone(mphone)" tooltip="邮件" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
+                    <a ng-click="phone(phone)" tooltip="邮件" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
                 </div>
                 <div class="col-xs-3">
-                    <a ng-click="phone(mphone)" tooltip="科室" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
+                    <a ng-click="phone(phone)" tooltip="科室" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
                 </div>
                 <div class="col-xs-3">
-                    <a ng-click="phone(myBrowsers.mphone)" tooltip="手机" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
+                    <a ng-click="phone(myBrowsers.phone)" tooltip="手机" tooltip-placement="left"><i class="ti-mobile"></i></a><code ng-bind="myBrowsers"></code>
                 </div>
             </div>
     </div>

assets/views/customform/tpl/ui-closehandler.html

@@ -55,10 +55,10 @@
                 <div class="col-xs-4">
                     <label class="control-label">联系电话</label>
                     <div class="input-group">
-                        <input class="form-control" ng-value="model[options.key].mphone" disabled="disabled" />
+                        <input class="form-control" ng-value="model[options.key].phone" disabled="disabled" />
                         <span class="input-group-btn">
                             <button class="btn btn-default"
-                                ng-click="dialout(model[options.key].mphone)"
+                                ng-click="dialout(model[options.key].phone)"
                                 type="button"><i class="ti-mobile"></i>
                             </button>
                         </span>

assets/views/customform/tpl/ui-disrequester.html

@@ -32,7 +32,7 @@
                     <div class="col-xs-4">
                         <label class="control-label">电话1</label>
                         <div class="">
-                            <input class="form-control" ng-value="model[options.key].mphone" type="text" disabled="disabled" />
+                            <input class="form-control" ng-value="model[options.key].phone" type="text" disabled="disabled" />
                         </div>
                     </div>
                     <div class="col-xs-4">

assets/views/customform/tpl/ui-multiuserselect - 副本.html

@@ -1,57 +0,0 @@
-<!--ng-click="options.templateOptions['onClick'](model[options.key], options, this, $event ,model);"-->
-<div class="panel panel-info">
-    <div class="panel-heading">
-        <strong class="control-label" ng-if="to.label">
-            {{to.label}}
-        </strong>
-        <ul class="panel-heading-tabs border-light">
-            <li>
-                <div class="pull-right">
-                    <a href="#" class="btn-sm btn-transparent" style="color:#ffffff;"  
-                    ng-click="options.templateOptions['openModal']('lg',options,to.modal,model[options.key]);"   type="button"><i class="glyphicon glyphicon-search"></i></a>
-                </div>
-            </li>
-        </ul>
-    </div>
-    <div class="panel-body" ng-model="model[options.key]" formly-custom-validation="options.validators">   
-        <div ng-repeat="useritem in model[options.key]" >
-            <div class="input-group col-xs-12">
-                <div class="col-xs-2">
-                    <label class="control-label ng-binding ng-scope">姓名*</label>
-                    <div class="input-group">
-                        <input class="form-control" type="text" ng-value="useritem.name" disabled="disabled"/>
-                    </div>
-                </div>
-                <div class="col-xs-2">
-                    <label class="control-label">科室</label>
-                    <div class="input-group">
-                        <input class="form-control" ng-value="useritem.department" type="text" disabled="disabled" />
-                    </div>
-                </div>
-                <div class="col-xs-2">
-                    <label class="control-label">邮箱</label>
-                    <div class="input-group">
-                        <input class="form-control" ng-value="useritem.email" type="text" disabled="disabled" />
-                    </div>
-                </div>
-                <div class="col-xs-2">
-                    <label class="control-label">手机</label>
-                    <div class="input-group">
-                        <input class="form-control" ng-value="useritem.phone" type="text" disabled="disabled" />
-                    </div>
-                </div>
-                <div class="col-xs-2">
-                    <label class="control-label">电话</label>
-                    <div class="input-group">
-                        <input class="form-control" ng-value="useritem.mphone" type="text" disabled="disabled" />
-                    </div>
-                </div>
-                <div class="col-xs-2">
-                    <div class="input-group">
-                        <button ng-click="remove(useritem.id)"><i class="fa fa-times"/></button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

assets/views/customform/tpl/ui-multiuserselect.html

@@ -7,13 +7,13 @@
         <ul class="panel-heading-tabs border-light">
             <li>
                 <div class="pull-right">
-                    <a href="#" class="btn-sm btn-transparent" style="color:#ffffff;"  
+                    <a href="#" class="btn-sm btn-transparent" style="color:#ffffff;"
                     ng-click="options.templateOptions['openModal']('lg',options,to.modal,model[options.key]);"   type="button"><i class="glyphicon glyphicon-search"></i></a>
                 </div>
             </li>
         </ul>
     </div>
-    <div class="panel-body" ng-model="model[options.key]" formly-custom-validation="options.validators">   
+    <div class="panel-body" ng-model="model[options.key]" formly-custom-validation="options.validators">
         <div ng-repeat="useritem in model[options.key]" >
             <div class="input-group col-xs-12">
                 <div class="col-xs-2">
@@ -43,7 +43,7 @@
                 <div class="col-xs-2">
                     <label class="control-label">电话</label>
                     <div class="input-group">
-                        <input class="form-control" ng-value="useritem.mphone" type="text" disabled="disabled" />
+                        <input class="form-control" ng-value="useritem.phone" type="text" disabled="disabled" />
                     </div>
                 </div>
                 <div class="col-xs-2">

assets/views/customform/tpl/ui-multiuserselectchange.html

@@ -6,13 +6,13 @@
         <ul class="panel-heading-tabs border-lightright">
             <li>
                 <div class="pull-right">
-                    <a href="#" class="btn-sm btn-transparent" style="color:#ffffff;"  
+                    <a href="#" class="btn-sm btn-transparent" style="color:#ffffff;"
                     ng-click="addlist('lg',options,to.modal,model[options.key]);"   type="button"><i class="fa fa-plus"></i></a>
                 </div>
             </li>
         </ul>
     </div>
-    <div class="panel-body" ng-model="model[options.key]" formly-custom-validation="options.validators">   
+    <div class="panel-body" ng-model="model[options.key]" formly-custom-validation="options.validators">
         <div ng-repeat="useritem in model[options.key]" >
             <div class="input-group col-xs-12">
                 <div class="col-xs-2">
@@ -42,7 +42,7 @@
                 <div class="col-xs-2">
                     <label class="control-label">电话</label>
                     <div class="input-group">
-                        <input class="form-control" ng-value="useritem.mphone" type="text"/>
+                        <input class="form-control" ng-value="useritem.phone" type="text"/>
                     </div>
                 </div>
                 <div class="col-xs-2">
@@ -63,7 +63,7 @@
         <ul class="panel-heading-tabs border-lightright">
             <li>
                 <div class="pull-right">
-                    <a  class="btn-sm btn-transparent" style="color:#ffffff;"  
+                    <a  class="btn-sm btn-transparent" style="color:#ffffff;"
                     ng-click="addlist('lg',options,to.modal,model[options.key]);"   type="button"><i class="fa fa-plus"></i></a>
                 </div>
             </li>
@@ -108,7 +108,7 @@
         <ul class="panel-heading-tabs border-lightright">
             <li>
                 <div class="pull-right">
-                    <a  class="btn-sm btn-transparent" style="color:#ffffff;"  
+                    <a  class="btn-sm btn-transparent" style="color:#ffffff;"
                     ng-click="addlist('lg',options,to.modal,model[options.key]);"   type="button"><i class="fa fa-plus"></i></a>
                 </div>
             </li>

assets/views/customform/tpl/ui-requesterinformation.html

@@ -33,14 +33,14 @@
             <div class="col-md-12">
                 <div class="control-label col-xs-12  fontsizes-16 formheardpad">
                     <!-- <div>
-                        <h1 class="row pull-left demo">手机号码:</h1>{{model[options.key].mphone||"无"}}</div> -->
+                        <h1 class="row pull-left demo">手机号码:</h1>{{model[options.key].phone||"无"}}</div> -->
                     <div class="row">
                         <div class="demo pull-left">联系电话</div>
-                        <span class="font-weight-600">: {{model[options.key].mphone}}</span>
+                        <span class="font-weight-600">: {{model[options.key].phone}}</span>
                     </div>
                 </div>
                 <!-- <div class="control-label col-xs-7  fontsizes-16 formheardpad">
-                    <div>{{model[options.key].mphone||"无"}}
+                    <div>{{model[options.key].phone||"无"}}
                     </div>
                 </div> -->
             </div>
@@ -91,7 +91,7 @@
                     </a>
                     <a class="" ng-click="options.templateOptions['changeRequeter']('lg',options,to.modal,model);"><i class="icon iconfont icon-xiugai margin-right-5 fontsizes-14"></i>修改
                     </a> -->
-                    
+
         <button style=" margin: 0;line-height: 10px;" ng-click="options.templateOptions['addRequeter']('lg',options,to.modal,$event);"
             class="btn btn-addbutton  addbutton col-md-offset-5 col-md-12">添加报修人</button>
         <button style=" margin: 8px 0 0;line-height: 10px;" ng-click="quickCopy(options.model)"

assets/views/customform/tpl/ui-userselect.html

@@ -65,7 +65,7 @@
     <div class="panel-body no-padding">
         <div class="col-md-2 partition-light no-padding">
             <a ng-click="options.templateOptions['openModal']('lg',options,to.modal);" class="dropdown-toggle">
-                <img src="assets/images/avatar-1.jpg" style="border-radius:20%" alt="{{model[options.key].name}}"> 
+                <img src="assets/images/avatar-1.jpg" style="border-radius:20%" alt="{{model[options.key].name}}">
                 <span class="username">{{model[options.key].name}} <i class="ti-angle-down"></i></i></span>
             </a>
         </div>
@@ -76,7 +76,7 @@
                     科室:{{model[options.key].department}}<br>
                     邮箱:{{model[options.key].email}}<br>
                     手机:{{model[options.key].phone}}<br>
-                    电话:{{model[options.key].mphone}}<br>
+                    电话:{{model[options.key].phone}}<br>
                 </p>
             </div>
         </div>
@@ -106,7 +106,7 @@
         </li>
         <li>
             <a>
-                电话:{{model[options.key].mphone}}
+                电话:{{model[options.key].phone}}
             </a>
         </li>
     </ul>
@@ -157,7 +157,7 @@
             <div class="col-xs-2">
                 <label class="control-label">电话</label>
                 <div class="input-group">
-                    <input class="form-control" ng-value="model[options.key].mphone" type="text" disabled="disabled" />
+                    <input class="form-control" ng-value="model[options.key].phone" type="text" disabled="disabled" />
                 </div>
             </div>
         </div>

assets/views/desk/jry_wxDetail.html

@@ -159,7 +159,7 @@
         <div class="messageBox">
           <div class="message" ng-show="repairMain.valueconfig ==1">报修人：{{model.requester.name}}</div>
           <div class="message" ng-show="repairMain.valueconfig ==2">报修科室：{{model.departmentDTO.dept}}</div>
-          <div class="message" ng-show="repairMain.valueconfig ==1">报修电话：{{model.requester.mphone}}</div>
+          <div class="message" ng-show="repairMain.valueconfig ==1">报修电话：{{model.requester.phone}}</div>
           <div class="message" ng-show="repairMain.valueconfig ==1">学工号：{{model.requester.account}}</div>
           <div class="message">状态：{{model.serviceState.name}}</div>
           <div class="message" ng-show="repairMain.valueconfig ==2"></div>

assets/views/incident/list.html

@@ -76,7 +76,7 @@
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">联系电话:</div>
                                 <input class=" inputcolor wt_width1 wt_width3 pull-right" type="text"
-                                    ng-model="searchkeys.requester.mphone" placeholder="" />
+                                    ng-model="searchkeys.requester.phone" placeholder="" />
                             </div>
                         </div>
 

assets/views/system/processdesign/knowledgedesign/system_1/tpl/systemuser.html

@@ -9,33 +9,33 @@
         <div class="col-md-7">
           <input  id="title" name="code" class="form-control"  ng-model="requesterdata.name" placeholder="姓名" />
         </div>
-      </div>  
+      </div>
       <div class="row form-group">
         <label class="col-md-3 col-md-offset-1 control-label" for="reason">工号:</label>
         <div class="col-md-7">
           <input  class="form-control" id="reason" name="reason" ng-model="requesterdata.account"   placeholder="工号" />
-        </div> 
+        </div>
       </div>
       <div class="row form-group">
         <label class="col-md-3 col-md-offset-1 control-label" for="type">科室:</label>
         <div class="col-md-7">
           <input  class="form-control" id="type" name="type" class="form-control" ng-model="requesterdata.deptName" placeholder="科室" />
-        </div> 
+        </div>
       </div>
       <div class="row form-group">
         <label class="col-md-3 col-md-offset-1 control-label" for="reason">电话:</label>
         <div class="col-md-7">
-          <input  class="form-control" id="reason" name="reason" ng-model="requesterdata.mphone"   placeholder="电话" />
-        </div> 
+          <input  class="form-control" id="reason" name="reason" ng-model="requesterdata.phone"   placeholder="电话" />
+        </div>
       </div>
       <div class="row form-group">
         <label class="col-md-3 col-md-offset-1 control-label" for="reason">email:</label>
         <div class="col-md-7">
           <input  class="form-control" id="reason" name="reason" ng-model="requesterdata.email"   placeholder="电话" />
-        </div> 
+        </div>
       </div>
 
-    </div> 
+    </div>
     <div class="panel-footer text-center">
         <a ng-click="savercode(closedata)"   data-dismiss="modal" class="btn btn-primary">保存</a>
         <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">取消</button>

assets/views/system/tpl/systemuser.html

@@ -14,31 +14,31 @@
         <label class="col-md-2 col-md-offset-1 control-label" for="reason">学工号:</label>
         <div class="col-md-8">
           <input  class="form-control" id="reason" name="reason" ng-model="requesterdata.studentNo"   placeholder="学工号" />
-        </div> 
-      </div>  
+        </div>
+      </div>
       <div class="row form-group">
         <label class="col-md-2 col-md-offset-1 control-label" for="reason">一卡通号:</label>
         <div class="col-md-8">
           <input  class="form-control" id="reason" name="reason" ng-model="requesterdata.account"   placeholder="一卡通号" />
-        </div> 
+        </div>
       </div>
       <div class="row form-group">
         <label class="col-md-2 col-md-offset-1 control-label" for="type">性别:</label>
         <div class="col-md-8">
           <input  class="form-control" id="type" name="type" class="form-control" ng-model="requesterdata.gender" placeholder="性别" />
-        </div> 
+        </div>
       </div>
       <div class="row form-group">
         <label class="col-md-2 col-md-offset-1 control-label" for="type">区域:</label>
         <div class="col-md-8">
           <input  class="form-control" id="type" name="type" class="form-control" ng-model="requesterdata.gender" placeholder="区域" />
-        </div> 
+        </div>
       </div>
       <div class="row form-group">
         <label class="col-md-2 col-md-offset-1 control-label" for="type">地点:</label>
         <div class="col-md-8">
           <input  class="form-control" id="type" name="type" class="form-control" ng-model="requesterdata.gender" placeholder="地点" />
-        </div> 
+        </div>
       </div>
       <!-- <div class="row form-group">
       <label class="col-md-2 col-md-offset-1 control-label" for="type">性别:</label>
@@ -51,14 +51,14 @@
                       <div ng-bind-html="item.gender | highlight: $select.search"></div>
                 </ui-select-choices>
             </ui-select>
-             
-        </div> 
+
+        </div>
     </div>  -->
       <div class="row form-group">
         <label class="col-md-2 col-md-offset-1 control-label" for="type">科室:</label>
         <div class="col-md-8">
           <input  class="form-control" id="type" name="type" class="form-control" ng-model="requesterdata.deptName" placeholder="科室" />
-        </div> 
+        </div>
       </div>
       <!-- <div class="row form-group">
       <label class="col-md-2 col-md-offset-1 control-label" for="type">科室:</label>
@@ -71,29 +71,29 @@
                       <div ng-bind-html="item.dept | highlight: $select.search"></div>
                 </ui-select-choices>
             </ui-select>
-             
-        </div> 
+
+        </div>
     </div>  -->
       <div class="row form-group">
         <label class="col-md-2 col-md-offset-1 control-label" for="reason">手机:</label>
         <div class="col-md-8">
-          <input  class="form-control" id="reason" name="reason" ng-model="requesterdata.mphone"   placeholder="手机" />
-        </div> 
+          <input  class="form-control" id="reason" name="reason" ng-model="requesterdata.phone"   placeholder="手机" />
+        </div>
       </div>
       <div class="row form-group">
         <label class="col-md-2 col-md-offset-1 control-label" for="reason">电话:</label>
         <div class="col-md-8">
           <input  class="form-control" id="reason" name="reason" ng-model="requesterdata.telephone"   placeholder="电话" />
-        </div> 
+        </div>
       </div>
       <div class="row form-group">
         <label class="col-md-2 col-md-offset-1 control-label" for="reason">email:</label>
         <div class="col-md-8">
           <input  class="form-control" id="reason" name="reason" ng-model="requesterdata.email"   placeholder="email" />
-        </div> 
+        </div>
       </div>
 
-    </div> 
+    </div>
     <div class="panel-footer text-center">
         <a ng-click="savercode(requesterdata)"   data-dismiss="modal" class="btn btn-primary">保存</a>
         <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">取消</button>