apply-clients 3.0.4 → 3.0.5-2

package/index.html

@@ -6,7 +6,7 @@
     <META HTTP-EQUIV="pragma" CONTENT="no-cache">
     <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
     <META HTTP-EQUIV="expires" CONTENT="0">
-    <title>燃气信息系统</title>
+    <title>荣浩燃气报装系统</title>
     <style media="screen">
     /*url(./static/newmainbg.jpg)*/
       body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.4",
+  "version": "3.0.5-2",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -59,6 +59,7 @@
     "express": "^4.17.0",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.4",
+    "form-create": "^1.6.6",
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^2.8.1",
     "http-proxy-middleware": "^0.11.0",
@@ -76,7 +77,7 @@
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
     "ldap-clients": "^0.5.1",
-    "material-client": "1.0.13",
+    "material-client": "^1.1.2",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "ncp": "^2.0.0",
@@ -91,7 +92,7 @@
     "system-clients": "^1.6.16",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "^1.21.4",
+    "vue-client": "1.21.48",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/App.vue

@@ -2,26 +2,137 @@
   <app-base class="bg">
     <div class='flex'>
       <article>
-        <!--<route :comp="{name: 'check-model'}"></route>-->
-        <!--<route :comp="{name: 'vender-management'}"></route>-->
-        <route :comp="{name: 'login'}"></route>
-        <!--<route :comp="{name: 'login'}"></route>-->
-        <!-- <route :comp="{name: 'load-data'}"></route> -->
-        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
-        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+        <route v-ref:route></route>
       </article>
     </div>
   </app-base>
 </template>
 
 <script>
-// import Login from './components/server/Login'
-// import cardListen from './plugins/CardListen'
+  import co from 'co'
+  import $ from 'jquery'
 
-export default {
-  // ready () {
-  //   cardListen.startListen()
-  // }
-  // components: { Login }
-}
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      "M+": this.getMonth() + 1, //月份
+      "d+": this.getDate(), //日
+      "H+": this.getHours(), //小时
+      "m+": this.getMinutes(), //分
+      "s+": this.getSeconds(), //秒
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+      "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+  }
+
+  let saveGen = function* (self) {
+    try {
+      yield self.$login.login(self.model.ename, self.model.password)
+      yield self.$appdata.load()
+
+      yield self.$getConfig(self, 'Login')
+      console.log('登录配置', self.config)
+      if (self.config.isMac) {
+        // 获取该登录人分公司下的mac配置
+        let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).catch(() => {
+          throw new Error('获取mac配置失败')
+        })
+        console.log('MAC地址信息', getMacs)
+        // 获取本地mac地址
+        let getLocalMac = yield self.$resetget('http://127.0.0.1:8003/loadmac', {
+          resolveMsg: null,
+          rejectMsg: null
+        }).catch(() => {
+          throw new Error('获取本地mac配置失败')
+        })
+        console.log('本地MAC地址信息', getLocalMac)
+        // 对Mac地址进行匹配
+        let macValidate = false
+        for (let i = 0; i < getLocalMac.data.mac.length; i++) {
+          for (let j = 0; j < getMacs.data.length; j++) {
+            if (getMacs.data[j].f_mac_number.toLocaleUpperCase() === getLocalMac.data.mac[i]) {
+              macValidate = true
+            }
+          }
+        }
+        if (!macValidate) {
+          throw new Error('Mac地址验证失败, 请联系管理员！！')
+        }
+      }
+      self.$refs.route.init('home-page', {functions: self.$login.f})
+    } catch (ret) {
+      console.error('登录失败', ret)
+      let msg
+      if (ret instanceof Error) {
+        msg = ret
+      }
+      if (ret.status === 0) {
+        msg = '服务连接错误，请确认服务状态'
+      } else if (ret.status === 401) {
+        msg = ret.data
+      } else if (ret.status === 710) {
+        msg = ret.data
+      }
+      self.createCode()
+      self.picLyanzhengma = ''
+      yield self.$showMessage(msg)
+      self.model.ename = ''
+      self.model.password = ''
+      self.login = false
+      $('form').fadeIn(500)
+    }
+  }
+  export default {
+    data() {
+      return {
+        model: {
+          ename: null,
+          password: null
+        },
+        checkCode: '',
+        config: {}
+      }
+    },
+    async ready() {
+      let self = this
+      var url = location.search;
+      var theRequest = new Object();
+      if (url.indexOf("?") != -1) {
+        var str = url.substr(1);
+        let strs = str.split("&");
+        for (var i = 0; i < strs.length; i++) {
+          theRequest[strs[i].split("=")[0]] = decodeURIComponent(strs[i].split("=")[1]);
+        }
+      }
+      if (theRequest.ename && theRequest.password) {
+        self.model.ename = theRequest.ename
+        self.model.password = theRequest.password
+        let gen = saveGen(self)
+        return co(gen)
+      } else {
+        // this.$goto('login')
+        this.$refs.route.init('login')
+      }
+    },
+    methods: {
+      createCode() {
+        let code = "";
+        let codeLength = 4;//验证码的长度
+        let random = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+          'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');//随机数
+        for (let i = 0; i < codeLength; i++) {
+          //循环操作
+          let index = Math.floor(Math.random() * 36);//取得随机数的索引（0~35）
+          code += random[index];//根据索引取得随机数加到code上
+        }
+        this.checkCode = code;//把code值赋给验证码
+      }
+    }
+  }
 </script>

package/src/apply.js

@@ -17,8 +17,12 @@ export default function () {
   Vue.component('exploration-select', (resolve) => { require(['./components/product/Process/ExplorationSelect'], resolve) })
   // 报建流程业务报建改装流程入口
   Vue.component('modify-user-files', (resolve) => { require(['./components/product/Process/ModifyUserFiles'], resolve) })
+  // 办理通气手续入口
+  Vue.component('procedures-datagrid', (resolve) => { require(['./components/product/Procedures/ProceduresDataGrid'], resolve) })
   // 报建收费查看
   Vue.component('apply-charge-search', (resolve) => { require(['./components/product/Process/Processes/Service/ApplyChargeSearch'], resolve) })
+  // 材料使用汇总
+  Vue.component('material-use-list', (resolve) => { require(['./components/product/Process/MaterialUseList'], resolve) })
   // 预算材料
   Vue.component('material-message', (resolve) => { require(['./components/product/Process/Processes/CustomerMaterialMessage'], resolve) })
   //领取材料
@@ -35,8 +39,13 @@ export default function () {
   Vue.component('building-message', (resolve) => { require(['./components/product/Process/Processes/CustomerBuildingMessage'], resolve) })
   // 业务tab(control层)页
   Vue.component('service-control', (resolve) => { require(['./components/product/Process/Processes/Service/ServiceControl'], resolve) })
+  // 更改历史
+  Vue.component('apply-change-history', (resolve) => { require(['./components/product/Process/Processes/Service/ApplyChangeHistory'], resolve) })
   // 公共业务显示(view层)页
   Vue.component('service-view', (resolve) => { require(['./components/product/ServiceView'], resolve) })
+
+  Vue.component('material-batch-list', (resolve) => { require(['./components/product/MaterialBatchList'], resolve) })
+  Vue.component('material-batch-manage', (resolve) => { require(['./components/product/MaterialBatchManage'], resolve) })
   // 派工单tab页 废弃
   // Vue.component('send-order', (resolve) => { require(['./components/product/Process/Processes/SendOrder'], resolve) })
   // 停气碰口tab页
@@ -124,6 +133,8 @@ export default function () {
   Vue.component('install-apply-cardlist', (resolve) => { require(['./components/product/VueUtils/rightview/InstallCardList2'], resolve) })
 
   Vue.component('back-page', (resolve) => { require(['./components/product/VueUtils/ToolsPage'], resolve) })
+
+  Vue.component('tree2', (resolve) => { require(['./components/product/VueUtils/Tree'], resolve) })
   // 流程监控总组件
   Vue.component('supervisory-control', (resolve) => { require(['./components/product/Supervisory/SupervisoryControl'], resolve) })
   Vue.component('supervisory-list', (resolve) => { require(['./components/product/Supervisory/SupervisoryList'], resolve) })
@@ -131,4 +142,9 @@ export default function () {
   Vue.component('supervisory-baseinfo', (resolve) => { require(['./components/product/Supervisory/SupervisoryBaseInfo'], resolve) })
   // 业务tab(control层)页
   Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
+  // 汇总查询入口 src/components/product/Statistics/ApplyStatisticsROOT.vue
+  Vue.component('apply-statistics-root', (resolve) => { require(['./components/product/Statistics/ApplyStatisticsROOT'], resolve) })
+  // 上传附件
+  // Vue.component('apply-upload', (resolve) => { require(['./components/product/Process/Processes/Upload'], resolve) })
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/Process/Processes/ApplyUpload'], resolve) })
 }

package/src/bootstrap/less/bootstrap.less

@@ -48,8 +48,7 @@
 // Components w/ JavaScript
 @import "modals.less";
 @import "tooltip.less";
-@import "popovers.less";
-@import "carousel.less";
+@import "standard.less";
 
 // Utility classes
 @import "utilities.less";

package/src/bootstrap/less/standard.less

@@ -0,0 +1,208 @@
+
+/*=========================通用样式表=========================*/
+    @font-face {
+      font-family: PingFang;
+      src:url('../fonts/PingFangSC-Regular.ttf');
+    }
+
+
+ /********************字体*****************/
+    /*字体标题_粗体*/
+    .font_bold_title{font-weight: bold; color: #333333;text-align: right;vertical-align: middle;}
+    /*字体正文_粗体*/
+    .font_bold_body{ font-family: PingFang; font-weight: bold;color: #666666;text-align: right;vertical-align: middle; }
+    /*字体_粗体*/
+    .font_bold_title1{ font-family: PingFang; font-weight: bold;color: #999999;text-align: right;vertical-align: middle;}
+    /*字体按钮_粗体*/
+    .font_bold_button{ font-family: PingFang; font-weight: bold;color: #ffffff;text-align: right;vertical-align: middle;}
+    /*字体蓝色_粗体*/
+    .font_bold_blue{ font-family: PingFang; font-weight: bold;color: #6aa6e2;text-align: right;vertical-align: middle;}
+
+    /*字体标题_正常*/
+    .font_normal_title{ font-family: PingFang; font-weight: normal;color: #333333!important;text-align: right;vertical-align: middle;}
+    /*字体正文_正常*/
+    .font_normal_body{ font-family: PingFang; font-weight: normal !important;color: #666666!important;text-align: right;vertical-align: middle;}
+    /*字体_正常*/
+    .font_normal_title1{ font-family: PingFang;font-weight: normal;color: #999999!important;text-align: right;vertical-align: middle;}
+    /*字体按钮_正常*/
+    .font_normal_button{ font-family: PingFang;font-weight: normal;color: #ffffff!important;text-align: right;vertical-align: middle;}
+    /*字体蓝色_正常*/
+    .font_normal_blue{ font-family: PingFang;font-weight: normal;color: #6aa6e2!important;text-align: right;vertical-align: middle;}
+
+    .search_area{background-color: #ffffff; border-radius: 10px;margin-bottom: 20px;padding: 20px}
+    .list_area{background-color: #ffffff; border-radius: 10px;padding: 20px}
+
+
+/********************表格*****************/
+    .table_sy{margin-top: 6px}
+    /*表格表头*/
+    .table_sy thead tr th{background-color: #eaf5ff!important;color: #666666 !important;font-family: PingFang !important;font-weight: normal!important;}
+    /*表格主体_奇数行*/
+    .table_sy tbody tr:nth-child(odd){background-color: #ffffff !important;border: solid 1px #f0f4fa !important;color: #666666!important;font-size: 15px!important;font-family: PingFang!important;}
+    /*表格主体_偶数行*/
+    .table_sy tbody tr:nth-child(even){background-color: #f6fbff !important;border: solid 1px #f0f4fa !important;color: #666666!important;font-size: 15px!important;font-family: PingFang!important;}
+    /*表格主体_移动行*/
+    .table_sy tbody tr:hover{	background-color: #ecf6ff!important;border: solid 1px #f0f4fa !important;color: #666666!important;font-size: 15px!important;font-family: PingFang!important;}
+    /*表格底部*/
+    .pager{background-color: #eaf5ff !important;}
+    /*表格主体_点击行*/
+    .success td{background-color: #ecf6ff !important;}
+
+    .foot{font-family: PingFang !important;}
+
+    /*下拉列表滑动变色*/
+    .select_list li a:hover{background-color: #eaf5ff !important;border-radius: 2px;border: solid 1px #eaeaea;}
+
+     /*弹窗*/
+    .pop_windows{background-color: #d9e9f8;border-radius: 16px 16px 0px 0px;}
+     /*标签*/
+    .tab_color{border-bottom: 1px solid #6aa6e2; color: #6aa6e2; font-family: PingFang;}
+
+    /*按钮间隔*/
+    .button_spacing{margin: 0px  0px 0px 10px;}
+
+
+    //报表样式
+    //报表头部
+    .report-head{ background-color: #b3dff7;border: solid 1px #999999;}
+    //头部字体
+    .head-font{color: #333333;font-size: 18px; }
+    //报表左侧
+    .report-left{background-color: #dff0f9;border: solid 1px #999999;}
+    //报表主体
+    .report-main {background-color: #ffffff; border: solid 1px #999999;}
+    //报表主体字体
+    .main-font{font-size: 18px;color: #1b1b1b; }
+
+
+/*=========================特殊样式表=========================*/
+
+/*分辨率@1920*1080*/
+@media screen and (max-width: 1920px) {
+
+  /********************按钮*****************/
+
+  .font_normal_body{font-size: 16px!important;    line-height: 42px;}
+  .font_bold_body{font-size: 16px!important;    line-height: 42px;}
+  .font_bold_title{font-size: 16px!important;    line-height: 42px;}
+  .table_sy thead tr th{font-size: 16px !important;}
+  .foot .pager{ font-size: 16px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager a{ font-size: 16px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager li{ font-size: 16px!important;	color: #666666!important;font-weight: normal!important;}
+
+
+  /*按钮查询*/
+  .button_search{width: 75px; height: 40px; background-color: #6aa6e2; border-radius: 4px;	border:none; font-family: PingFang; font-size: 16px; 	color: #ffffff;}
+  .button_search:hover{	background-color: #3592ef;}
+
+  /*按钮清空*/
+  .button_clear{width: 75px; height: 40px;  background-color: #5ac0d9; border-radius: 4px;border:none;	font-family: PingFang; font-size: 16px; 	color: #ffffff;}
+  .button_clear:hover{	background-color: #27c4eb;}
+
+  /*按钮新建*/
+  .button_new{width: 75px; height: 40px;  background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 16px; color: #6aa6e2;}
+  .button_new:hover{background-color: #f0f8ff;}
+
+  /*按钮导出*/
+  .button_export {width: 110px; height: 40px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 16px; color: #6aa6e2;}
+  .button_export:hover{background-color: #f0f8ff;}
+  .button_export button{width: 110px; height: 40px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 16px; color: #6aa6e2;}
+  .button_export button:hover{background-color: #f0f8ff;}
+
+  /*查询输入框*/
+  .input_search{	width: 270px;height: 40px;background-color: #ffffff;border-radius: 2px;border: solid 1px #c7c7c7;color: #333333;	font-size: 16px;font-family: PingFang;}
+  .input_search .datepicker .datepicker-input input{	width: 270px!important;height: 42px!important;background-color: #ffffff!important;border-radius: 2px;border: solid 1px #c7c7c7 !important;color: #333333;	font-size: 16px;font-family: PingFang;}
+  .input_search::-webkit-input-placeholder{color: #999999;	font-size: 16px;padding-left:15px;font-family: PingFang;}
+  .input_search:focus{	border: solid 1px #6aa6e2;}
+
+
+  /*下拉框*/
+  .select  button{width: 270px!important;height: 40px!important;background-color: #ffffff!important;border-radius: 2px!important;border: solid 1px #c7c7c7!important;color: #666666;	font-size: 16px;font-family: PingFang;font-weight: normal!important;}
+  .select  button:focus{	border: solid 1px #6aa6e2!important;}
+
+}
+
+/*分辨率@1600*900*/
+@media screen and (max-width: 1600px) {
+
+  /********************按钮*****************/
+  /*按钮间隔*/
+  /*.button_spacing{margin: 0px  0px 0px 20px;}*/
+  .font_normal_body{font-size: 15px!important;    line-height: 38px; }
+  .font_bold_body{font-size: 15px!important;    line-height: 38px; }
+  .font_bold_title{font-size: 15px!important;    line-height: 38px; }
+  .table_sy thead tr th{font-size: 15px !important;}
+  .foot .pager{ font-size: 15px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager a{ font-size: 15px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager li{ font-size: 15px!important;	color: #666666!important;font-weight: normal!important;}
+
+  /*按钮查询*/
+  .button_search{width: 70px; height: 36px; background-color: #6aa6e2; border-radius: 4px;	border:none; font-family: PingFang; font-size: 15px; 	color: #ffffff;}
+  .button_search:hover{	background-color: #3592ef;}
+
+  /*按钮清空*/
+  .button_clear{width: 70px; height: 36px; background-color: #5ac0d9; border-radius: 4px;border:none;	font-family: PingFang; font-size: 15px; 	color: #ffffff;}
+  .button_clear:hover{	background-color: #27c4eb;}
+
+  /*按钮新建*/
+  .button_new{width: 70px; height: 36px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 15px; color: #6aa6e2;}
+  .button_new:hover{background-color: #f0f8ff;}
+
+  /*按钮导出*/
+  .button_export {width: 110px; height: 36px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 15px; color: #6aa6e2;}
+  .button_export:hover{background-color: #f0f8ff;}
+  .button_export button{width: 120px; height: 32px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 15px; color: #6aa6e2;}
+  .button_export button:hover{background-color: #f0f8ff;}
+
+  /*查询输入框*/
+  .input_search{	width: 200px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #c7c7c7!important;color: #333333!important;	font-size: 15px!important;font-family: PingFang;}
+  .input_search::-webkit-input-placeholder{color: #999999;	font-size: 14px;padding-left:15px;font-family: PingFang;}
+  .input_search:focus{	border: solid 1px #6aa6e2;}
+
+  /*下拉框*/
+  .select  button{width: 200px!important;height: 36px!important;background-color: #ffffff!important;border-radius: 2px!important;border: solid 1px #c7c7c7!important;color: #666666!important;	font-size: 15px!important;font-family: PingFang;font-weight: normal!important;}
+  .select  button:focus{	border: solid 1px #6aa6e2!important;}
+}
+
+/*分辨率@1366*768*/
+@media screen and (max-width: 1366px) {
+
+  /********************按钮*****************/
+  /*按钮间隔*/
+  /*.button_spacing{margin: 0px  0px 0px 20px;}*/
+  .font_normal_body{font-size: 14px!important;    line-height: 36px; }
+  .font_bold_body{font-size: 14px!important;    line-height: 36px; }
+  .font_bold_title{font-size: 14px!important;    line-height: 36px; }
+  .table_sy thead tr th{font-size: 14px !important;}
+  .foot .pager{ font-size: 14px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager a{ font-size: 14px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager li{ font-size: 14px!important;	color: #666666!important;font-weight: normal!important;}
+
+  /*按钮查询*/
+  .button_search{width: 60px; height: 34px; background-color: #6aa6e2; border-radius: 4px;	border:none; font-family: PingFang; font-size: 14px; 	color: #ffffff;}
+  .button_search:hover{	background-color: #3592ef;}
+
+  /*按钮清空*/
+  .button_clear{width: 60px; height: 34px; background-color: #5ac0d9; border-radius: 4px;border:none;	font-family: PingFang; font-size: 14px; 	color: #ffffff;}
+  .button_clear:hover{	background-color: #27c4eb;}
+
+  /*按钮新建*/
+  .button_new{width: 60px; height: 34px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 14px; color: #6aa6e2;}
+  .button_new:hover{background-color: #f0f8ff;}
+
+  /*按钮导出*/
+  .button_export {width: 110px; height: 34px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 14px; color: #6aa6e2;}
+  .button_export:hover{background-color: #f0f8ff;}
+  .button_export button{width: 110px !important; height: 34px!important; background-color: #ffffff!important;border-radius: 4px!important;border: solid 1px #6aa6e2!important;	font-family: PingFang; font-size: 14px!important; color: #6aa6e2!important;}
+  .button_export button:hover{background-color: #f0f8ff;}
+
+  /*查询输入框*/
+  .input_search{	width: 180px;height: 34px;background-color: #ffffff;border-radius: 2px;border: solid 1px #c7c7c7;color: #333333;	font-size: 14px;font-family: PingFang;}
+  .input_search::-webkit-input-placeholder{color: #999999;	font-size: 14px;padding-left:15px;font-family: PingFang;}
+  .input_search:focus{	border: solid 1px #6aa6e2;}
+
+  /*下拉框*/
+  .select  button{width: 180px!important;height: 34px!important;background-color: #ffffff!important;border-radius: 2px!important;border: solid 1px #c7c7c7!important;color: #666666!important;	font-size: 14px!important;font-family: PingFang;font-weight: normal!important;}
+  .select  button:focus{	border: solid 1px #6aa6e2!important;}
+
+}

package/src/components/Util.js

@@ -21,6 +21,10 @@ export function getAttendanceState (item, timeToWork, timeToGo) {
   }
 }
 
+export function isEmpty (str) {
+  return str === undefined || str === null || str.toString().trim() === ''
+}
+
 export function toStandardYearMonth () {
   let dt = new Date()
   let month = dt.getMonth() + 1

package/src/components/app_apply/FieldExploration.vue

@@ -5,11 +5,11 @@
         <div class="row auto">
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group mg8">
             <label class="text-justify lb-left" for="f_install_num">实际可安装用户:</label>
-            <input  type="text" class="form-control" id="f_install_num" v-model="model.f_install_num" >
+            <input  type="number" class="form-control" id="f_install_num" v-model="model.f_install_num" >
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group" >
             <label class="text-justify lb-left" for="costmatter">缴费户数:</label>
-            <input  type="text" class="form-control" id="costmatter" v-model="model.f_payfee_num" >
+            <input  type="number" class="form-control" id="costmatter" v-model="model.f_payfee_num" >
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group">
             <label class="text-justify lb-left" >用气类型:</label>

package/src/components/app_apply/Ventilation.vue

@@ -9,11 +9,11 @@
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group" :class="[$v.f_gas_number.pattern ? 'has-error' : '']">
             <label class="text-justify lb-left" for="f_gas_number">通气户数：</label>
-            <input type="text" class="form-control" id="f_gas_number" v-model="model.f_gas_number" v-validate:f_gas_number="{pattern:'/^[+]{0,1}(\\d+)$|^[+]{0,1}(\\d+\\.\\d+)$/'}">
+            <input type="number" class="form-control" id="f_gas_number" v-model="model.f_gas_number" v-validate:f_gas_number="{pattern:'/^[+]{0,1}(\\d+)$|^[+]{0,1}(\\d+\\.\\d+)$/'}">
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group" :class="[$v.f_notgas_number.pattern ? 'has-error' : '']">
             <label class="text-justify lb-left" for="f_notgas_number">未通气户数：</label>
-            <input type="text" class="form-control" id="f_notgas_number" v-model="model.f_notgas_number" v-validate:f_notgas_number="{pattern:'/^[+]{0,1}(\\d+)$|^[+]{0,1}(\\d+\\.\\d+)$/'}">
+            <input type="number" class="form-control" id="f_notgas_number" v-model="model.f_notgas_number" v-validate:f_notgas_number="{pattern:'/^[+]{0,1}(\\d+)$|^[+]{0,1}(\\d+\\.\\d+)$/'}">
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group" :class="$v.f_regulatoruser.required ? 'has-error' : ''">
             <label class="text-justify lb-left" for="f_regulatoruser">调压人员：</label>

package/src/components/product/Function/InstallFunction.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="full">
+  <div class="full" style="background-color:  #f6f6f6;">
     <div class="flex-row">
-      <div class="flex" style="flex: 1" :style="{height: totalheight}">
+      <div class="flex" style="flex: 1" :style="{height: totalheight,width:'80%'}">
         <div class="flex col-sm-12" :style="{height: leftheight}">
           <installinfoselect v-ref:installselect></installinfoselect>
         </div>
@@ -21,7 +21,7 @@
           <route v-ref:route></route>
         </div>
       </div>
-      <div style="width: 350px;padding:0px 0px 10px 0px;margin-left: 20px">
+      <div style="width: 20%;padding:0px 0px 0px 0px;margin-left: 0px">
         <install-apply-cardlist :btns="operatebtn" :userinfoid="row ? row.f_userinfo_id : ''" @list-select-oper="recordCancel"
                           v-ref:card></install-apply-cardlist>
       </div>
@@ -50,7 +50,11 @@
     },
     created(){
       let http = new HttpResetClass()
-      http.load('POST','rs/logic/ApplyGetConfigs', {data:this.$login.f}, {resolveMsg: null, rejectMsg: null}
+      let xmldata = {
+        data: this.$login.f,
+        workname: '工商业报建流程'
+      }
+      http.load('POST','rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null}
       ).then((res)=>{
         if(res.data.code && res.data.code == 200){
           Vue.function_vue = Vue.prototype.$function_vue = res.data.function_vue
@@ -91,7 +95,7 @@
         // this.show = true
         this.showallbtn = true
         this.leftheight = '25%'
-        this.totalheight = '80%'
+        this.totalheight = '100%'
       },
       'hiddenbtn'() {
         this.showallbtn = false