apply-clients 3.3.81 → 3.3.83

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -4,21 +4,26 @@
       <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-3">
+              <label class="font_normal_body">客户名称：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">组织机构：</label>
               <res-select
                 restype='organization'
-                :initresid='$parent.$parent.curorgid'
+                :initresid='$parent.$parent.curorgid'·
                 @res-select="$parent.$parent.getorg"
                 is-mul="false"
               ></res-select>
             </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">工程编号：</label>
-              <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
-                     v-on:keyup.enter="search"
-                     condition="f_apply_num = '{}'">
-            </div>
+<!--            <div class="form-group col-sm-3">-->
+<!--              <label class="font_normal_body">工程编号：</label>-->
+<!--              <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"-->
+<!--                     v-on:keyup.enter="search"-->
+<!--                     condition="f_apply_num = '{}'">-->
+<!--            </div>-->
             <div class="form-group col-sm-2 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
               <button class="button_search button_spacing" @click="$parent.$parent.loadPage()">返回</button>
@@ -38,10 +43,16 @@
             </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" style="width:60%" class="input_search" v-model="model.f_user_name"-->
+<!--                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>-->
+<!--            </div>-->
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">客户名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+              <label class="font_normal_body">工程编号：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
+                     v-on:keyup.enter="search"
+                     condition="f_apply_num = '{}'">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">联系电话：</label>
@@ -137,6 +148,12 @@
               <input type="text" style="width:60%" class="input_search" v-model="model.f_construction_unit"
                      v-on:keyup.enter="$parent.$parent.search()" condition="f_construction_unit like '%{}%'" placeholder='施工单位'>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">表&emsp;&emsp;号：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='表号' v-model="model.f_meternumber"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_meternumber like '%{}%'">
+            </div>
           </div>
         </div>
       </criteria>
@@ -252,7 +269,8 @@
           'f_operator': '发起人',
           'f_install_project': '安装项目',
           'f_construction_unit': '施工单位',
-          'f_construction_date': '施工时间'
+          'f_construction_date': '施工时间',
+          'f_meternumber':'表号'
         }
       }
     },

package/src/main.js

@@ -2,23 +2,21 @@ import Vue from 'vue'
 import App from './App'
 import { all } from 'vue-client'
 import {ldap} from 'ldap-clients'
-//import {system} from 'system-clients'
-import {systemphonegrid} from 'system-phone'
+import {system} from 'system-clients'
 import {sale} from 'sale-client'
 import {material} from 'material-client'
 
-//import apply from './apply'
+import apply from './apply'
 
- import applyAndroid from './applyAndroid'
+// import applyAndroid from './applyAndroid'
 
 all()
-//apply()
- applyAndroid()
+apply()
+// applyAndroid()
 ldap()
 sale()
 material()
-//system()
-systemphonegrid(false)
+system(false)
 
 require('system-clients/src/styles/less/bootstrap.less')
 require('./expandcss.less')