apply-clients 7.1.48 → 7.1.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.48",
+  "version": "7.1.49",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -78,23 +78,23 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.18",
+    "ldap-clients": "0.4.5",
     "material-client": "^1.1.2",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "ncp": "^2.0.0",
     "nightwatch": "^0.8.18",
     "rimraf": "^2.5.0",
-    "sale-client": "^1.4.33",
+    "sale-client": "1.5.14-yulinzhongran",
     "selenium-server": "2.52.0",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.1.87",
+    "system-clients": "1.6.34",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "1.23.10",
+    "vue-client": "1.20.55",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

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

@@ -1,147 +1,147 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main" style="overflow: auto;width: 100%">
-      <div class="col-sm-12">
-        <div :class="showData ? 'top' : 'auto'">
-          <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
-        </div>
-        <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
-          <div class="panel-heading head" style="background-color: #e8f4ff">{{funcdata.title}}</div>
-          <div class="panel-body" style="height: 89%">
-            <function-service-control v-ref:func :funcdata="funcdata" :selectdata="selectdata"></function-service-control>
-          </div>
-        </div>
-      </div>
-      <!--
-        <div class="col-sm-2">
-          <stop-apply-cardlist v-ref:card></stop-apply-cardlist>
-        </div>
-      -->
-    </div>
-  </div>
-
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建业务',
-    data () {
-      return {
-        selectdata: null,
-        funcdata: null, // 选中功能
-        showtotal: false, // 控制详情显示
-        showData: true     // 控制列表数据
-      }
-    },
-    created () {
-      this.getConfig()
-    },
-    methods: {
-      // 获取功能配置
-      getConfig () {
-        let http = new HttpResetClass()
-        let data = {
-          data: this.$login.f
-        }
-        http.load('POST', 'rs/logic/ApplyGetFunction', {data: data}, {resolveMsg: null, rejectMsg: null}
-        ).then((res) => {
-          if (res.data.code && res.data.code === 200) {
-            Vue.prototype.$function_vue = res.data.function_vue
-          } else {
-            this.$showMessage('获取配置失败,原因:' + res.data.msg)
-            return
-          }
-        })
-      }
-    },
-    events: {
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-        let http = new HttpResetClass()
-        let data = {
-          condition: `u.id = ${servicedata.id}`,
-          data: {
-            id: this.$login.f.id,
-            orgid: this.$login.f.f_orgids
-          }
-        }
-
-        try {
-          let res = await http.load('POST', 'rs/sql/checkuserfunction', {data: data}, {resolveMsg: null, rejectMsg: null})
-
-          this.showtotal = false
-          this.selectdata = res.data[0]
-          this.$nextTick(() => {
-            this.showtotal = true
-          })
-        } catch (e) {
-          this.$showAlert('数据更新失败，请手查询更新！！！', 'danger', 3000)
-        }
-      },
-      // 查询
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      },
-      // 点击功能操作
-      'func' (funcdata, row) {
-        this.funcdata = funcdata
-        this.selectdata = row
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-        // 关闭列表数据
-        this.showData = false
-
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-      }
-      /*
-        'operate' (row) {
-          this.show = false
-          this.funcdata = {
-            title: '撤销'
-          }
-          let http = new HttpResetClass()
-          let data = {
-            tablename: 't_apply',
-            condition: `f_process_id='${row.processid}'`
-          }
-          http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null,rejectMsg: '工程查询失败'})
-            .then(res => {
-              console.log(res.data[0])
-              this.selectdata = res.data[0]
-              this.selectdata.stopapply = row
-              this.selectheight = '10%'
-              this.funcheight = '90%'
-              this.$refs.installselect.$refs.cp.pager = false
-              this.show = true
-            })
-        }
-
-      */
-    }
-  }
-</script>
-<style scoped>
-  /*清除浮动*/
-  .clearfix:after,.clearfix:before{
-    display: table;
-  }
-  .clearfix:after{
-    clear: both;
-  }
-  .head{
-    height: auto;
-    font-weight: bold;
-    color: #000000;
-    font-family: 微软雅黑;
-  }
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main" style="overflow: auto;width: 100%">
+      <div class="col-sm-12">
+        <div :class="showData ? 'top' : 'auto'">
+          <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
+        </div>
+        <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
+          <div class="panel-heading head" style="background-color: #e8f4ff">{{funcdata.title}}</div>
+          <div class="panel-body" style="height: 89%">
+            <function-service-control v-ref:func :funcdata="funcdata" :selectdata="selectdata"></function-service-control>
+          </div>
+        </div>
+      </div>
+      <!--
+        <div class="col-sm-2">
+          <stop-apply-cardlist v-ref:card></stop-apply-cardlist>
+        </div>
+      -->
+    </div>
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建业务',
+    data () {
+      return {
+        selectdata: null,
+        funcdata: null, // 选中功能
+        showtotal: false, // 控制详情显示
+        showData: true     // 控制列表数据
+      }
+    },
+    created () {
+      this.getConfig()
+    },
+    methods: {
+      // 获取功能配置
+      getConfig () {
+        let http = new HttpResetClass()
+        let data = {
+          data: this.$login.f
+        }
+        http.load('POST', 'rs/logic/ApplyGetFunction', {data: data}, {resolveMsg: null, rejectMsg: null}
+        ).then((res) => {
+          if (res.data.code && res.data.code === 200) {
+            Vue.prototype.$function_vue = res.data.function_vue
+          } else {
+            this.$showMessage('获取配置失败,原因:' + res.data.msg)
+            return
+          }
+        })
+      }
+    },
+    events: {
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+        let http = new HttpResetClass()
+        let data = {
+          condition: `u.id = ${servicedata.id}`,
+          data: {
+            id: this.$login.f.id,
+            orgid: this.$login.f.f_orgids
+          }
+        }
+
+        try {
+          let res = await http.load('POST', 'rs/sql/checkuserfunction', {data: data}, {resolveMsg: null, rejectMsg: null})
+
+          this.showtotal = false
+          this.selectdata = res.data[0]
+          this.$nextTick(() => {
+            this.showtotal = true
+          })
+        } catch (e) {
+          this.$showAlert('数据更新失败，请手查询更新！！！', 'danger', 3000)
+        }
+      },
+      // 查询
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      // 点击功能操作
+      'func' (funcdata, row) {
+        this.funcdata = funcdata
+        this.selectdata = row
+        // 关闭分页
+        this.$refs.query.$refs.cp.pager = false
+        // 关闭列表数据
+        this.showData = false
+
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+      }
+      /*
+        'operate' (row) {
+          this.show = false
+          this.funcdata = {
+            title: '撤销'
+          }
+          let http = new HttpResetClass()
+          let data = {
+            tablename: 't_apply',
+            condition: `f_process_id='${row.processid}'`
+          }
+          http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null,rejectMsg: '工程查询失败'})
+            .then(res => {
+              console.log(res.data[0])
+              this.selectdata = res.data[0]
+              this.selectdata.stopapply = row
+              this.selectheight = '10%'
+              this.funcheight = '90%'
+              this.$refs.installselect.$refs.cp.pager = false
+              this.show = true
+            })
+        }
+
+      */
+    }
+  }
+</script>
+<style scoped>
+  /*清除浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+  .head{
+    height: auto;
+    font-weight: bold;
+    color: #000000;
+    font-family: 微软雅黑;
+  }
+</style>

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

@@ -4,75 +4,76 @@
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <div class="form-group col-sm-5">
-              <label class="font_normal_body">项目名称/客户名称/联系人:</label>
-              <input type="text" class="input_search" v-model="model.f_user_name"
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body col-sm-4">项目名称/客户名称/联系人:</label>
+              <input type="text" class="input_search col-sm-8" v-model="model.f_user_name"
                      v-on:keyup.enter="$parent.$parent.search()" condition=" (u.f_entry_name like '%{}%' or u.f_user_name like '%{}%' or u.f_contact like '%{}%') " placeholder='三选一输入'>
             </div>
-            <div class="form-group col-sm-4">
-              <label class="font_normal_body">报建编号：</label>
-              <input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body col-sm-4">报建编号：</label>
+              <input type="text" class="input_search col-sm-8" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_apply_num = '{}'">
             </div>
             <div class="form-group col-sm-3 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
-              <div
-                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+              <button
+                class="button_clear button_spacing"
                 @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
-                class="button_spacing"
                 style="float: right">
-              </div>
+                {{ $parent.$parent.criteriaShow ? '隐藏' : '显示'}}
+              </button>
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="form-group col-sm-4">
-              <label class="font_normal_body">合同编号：</label>
-              <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body col-sm-4">合同编号：</label>
+              <input type="text" class="input_search col-sm-8" placeholder='合同编号' v-model="model.f_contract_number"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_contract_number = '{}'">
             </div>
-            <div class="form-group col-sm-4">
-              <label class="font_normal_body">报建类型：</label>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body col-sm-4">报建类型：</label>
               <v-select
                 v-model="model.f_apply_type"
                 placeholder='报建类型'
                 condition="f_apply_type like '%{}%'"
                 :value.sync="model.f_apply_type"
                 :options='$parent.$parent.applytype'
-                class="select select_list"
+                class="select select_list col-sm-8"
                 :value-single="true"
                 @change="$parent.$parent.applyTypeChange()"
                 close-on-select ></v-select>
             </div>
-            <div class="form-group col-sm-4">
-              <label class="font_normal_body">办理环节：</label>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body col-sm-4">办理环节：</label>
               <v-select
                 v-model="model.defname"
                 placeholder='办理环节'
                 condition="defname = '{}'"
                 :value.sync="model.defname"
                 :options='$parent.$parent.defnames'
-                class="select select_list"
+                class="select select_list col-sm-8"
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
-            <div class="form-group col-sm-4">
-              <label class="font_normal_body">联系电话：</label>
-              <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body col-sm-4">联系电话：</label>
+              <input type="text" class="input_search col-sm-8" placeholder='联系电话' v-model="model.f_phone"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_phone like '%{}%'">
             </div>
-            <div class="form-group col-sm-4">
-              <label class="font_normal_body">用户地址：</label>
-              <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body col-sm-4">用户地址：</label>
+              <input type="text" class="input_search col-sm-8" placeholder='用户地址' v-model="model.f_address"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_address like '%{}%'">
             </div>
-            <div class="form-group col-sm-4">
-              <label  for="startDate" class="font_normal_body">开始时间：</label>
+            <div class="form-group col-sm-3">
+              <label  for="startDate" class="font_normal_body col-sm-4">开始时间：</label>
               <datepicker id="startDate" placeholder="开始日期"
+                          class="col-sm-8"
                           style="width: 60%!important;"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
@@ -81,9 +82,10 @@
                           condition="f_apply_date >= '{}'">
               </datepicker>
             </div>
-            <div class="form-group col-sm-4">
-              <label for="endDate" class="font_normal_body">结束时间：</label>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body col-sm-4">结束时间：</label>
               <datepicker id="endDate" placeholder="结束日期"
+                          class="col-sm-8"
                           style="width: 60%!important;"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
@@ -171,7 +173,7 @@
     data () {
       return {
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-        defnames: [{label: '全部', value: ''}], // 流程节点
+        defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
         model: new PagedList('rs/sql/checkuserfunction', 20, {
           data: {
             id: this.$login.f.id,
@@ -206,7 +208,7 @@
             this.defnames = [{label: '全部', value: ''}, ...res.data]
           })
         } else {
-          this.defnames = [{label: '全部', value: ''}]
+          this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
         }
       },
       // 获取配置
@@ -278,4 +280,20 @@
   }
 </script>
 <style scoped>
+
+.select_list {
+  width: 200px;
+  height: 34px;
+}
+.input_search{
+  padding: 7px;
+  width: 200px;
+  height: 34px;
+  background-color: #ffffff;
+  border-radius: 2px;
+  border: solid 1px #c7c7c7 !important;
+  color: #333333 !important;
+  font-size: 15px !important;
+  font-family: PingFang;
+}
 </style>

package/src/components/product/Process/ExplorationSelect.vue

@@ -5,19 +5,19 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">项目、客户名称:</label>
-                <input type="text" class="input_search" v-model="model.f_user_name"
+                <label class="font_normal_body col-sm-4">项目、客户名称:</label>
+                <input type="text" class="input_search col-sm-8" v-model="model.f_user_name"
                        v-on:keyup.enter="$parent.$parent.search()" condition=" (u.f_entry_name like '%{}%' or u.f_user_name like '%{}%' or u.f_contact like '%{}%') " placeholder='项目名称/客户名称/联系人'>
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">报建编号：</label>
-                <input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
+                <label class="font_normal_body col-sm-4">报建编号：</label>
+                <input type="text" class="input_search col-sm-8" placeholder='报建编号' v-model="model.f_apply_num"
                        v-on:keyup.enter="$parent.$parent.search()"
                        condition="f_apply_num = '{}'">
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">用户编号：</label>
-                <input type="text" class="input_search" placeholder='用户编号' v-model="model.f_userinfo_code"
+                <label class="font_normal_body col-sm-4">用户编号：</label>
+                <input type="text" class="input_search col-sm-8" placeholder='用户编号' v-model="model.f_userinfo_code"
                        v-on:keyup.enter="search"
                        condition="ui.f_userinfo_code like '%{}%'">
               </div>
@@ -27,61 +27,62 @@
                         @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
                 <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
-                <div
-                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                <button
+                  class="button_clear button_spacing"
                   @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
-                  class="button_spacing"
                   style="float: right">
-                </div>
+                  {{ $parent.$parent.criteriaShow ? '隐藏' : '显示'}}
+                </button>
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">合同编号：</label>
-                <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
+                <label class="font_normal_body col-sm-4">合同编号：</label>
+                <input type="text" class="input_search col-sm-8" placeholder='合同编号' v-model="model.f_contract_number"
                        v-on:keyup.enter="$parent.$parent.search()"
                        condition="f_contract_number = '{}'">
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">报建类型：</label>
+                <label class="font_normal_body col-sm-4">报建类型：</label>
                 <v-select
                   v-model="model.f_apply_type"
                   placeholder='报建类型'
                   condition="f_apply_type like '%{}%'"
                   :value.sync="model.f_apply_type"
                   :options='$parent.$parent.applytype'
-                  class="select select_list"
+                  class="select select_list col-sm-8"
                   :value-single="true"
                   @change="$parent.$parent.applyTypeChange()"
                   close-on-select ></v-select>
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">办理环节：</label>
+                <label class="font_normal_body col-sm-4">办理环节：</label>
                 <v-select
                   v-model="model.defname"
                   placeholder='办理环节'
                   condition="defname = '{}'"
                   :value.sync="model.defname"
                   :options='$parent.$parent.defnames'
-                  class="select select_list"
+                  class="select select_list col-sm-8"
                   :value-single="true"
                   close-on-select ></v-select>
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">联系电话：</label>
-                <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"
+                <label class="font_normal_body col-sm-4">联系电话：</label>
+                <input type="text" class="input_search col-sm-8" placeholder='联系电话' v-model="model.f_phone"
                        v-on:keyup.enter="$parent.$parent.search()"
                        condition="f_phone like '%{}%'">
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">用户地址：</label>
-                <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"
+                <label class="font_normal_body col-sm-4">用户地址：</label>
+                <input type="text" class="input_search col-sm-8" placeholder='用户地址' v-model="model.f_address"
                        v-on:keyup.enter="$parent.$parent.search()"
                        condition="f_address like '%{}%'">
               </div>
               <div class="form-group col-sm-3">
-                <label  for="startDate" class="font_normal_body">开始时间：</label>
+                <label  for="startDate" class="font_normal_body col-sm-4">开始时间：</label>
                 <datepicker id="startDate" placeholder="开始日期"
+                            class="col-sm-8"
                             style="width: 60%!important;"
                             v-model="model.startDate"
                             :value.sync="model.startDate"
@@ -91,8 +92,9 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-3">
-                <label for="endDate" class="font_normal_body">结束时间：</label>
+                <label for="endDate" class="font_normal_body col-sm-4">结束时间：</label>
                 <datepicker id="endDate" placeholder="结束日期"
+                            class="col-sm-8"
                             style="width: 60%!important;"
                             v-model="model.endDate"
                             :value.sync="model.endDate"
@@ -207,7 +209,7 @@
     data () {
       return {
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
-        defnames: [{label: '全部', value: ''}], // 流程节点
+        defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
         model: new PagedList('rs/sql/checkuser', 20, {
           data: {
             id: this.$login.f.id,
@@ -245,7 +247,7 @@
             this.defnames = [{label: '全部', value: ''}, ...res.data]
           })
         } else {
-          this.defnames = [{label: '全部', value: ''}]
+          this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
         }
       },
       // 获取流程id
@@ -342,7 +344,21 @@
   }
 </script>
 <style scoped>
-
+  .select_list {
+    width: 200px;
+    height: 34px;
+  }
+  .input_search{
+    padding: 7px;
+    width: 200px;
+    height: 34px;
+    background-color: #ffffff;
+    border-radius: 2px;
+    border: solid 1px #c7c7c7 !important;
+    color: #333333 !important;
+    font-size: 15px !important;
+    font-family: PingFang;
+  }
   .p1 {
     color: #dc0b12;
     font-weight:bold