apply-clients 4.1.78 → 4.1.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.78",
+  "version": "4.1.81",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -92,7 +92,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.1.87",
+    "system-clients": "3.2.1-11",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
     "vue-client": "1.24.39",

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

@@ -7,13 +7,13 @@
             <div class="form-group col-sm-5">
               <label class="font_normal_body">项目名称:</label>
               <input type="text" class="input_search" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name ='{}' " placeholder='请输入'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name 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"
                      v-on:keyup.enter="$parent.$parent.search()"
-                     condition="f_apply_num = '{}'">
+                     condition="f_apply_num like '%{}%'">
             </div>
             <div class="form-group col-sm-3 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
@@ -31,7 +31,7 @@
               <label class="font_normal_body">合同编号：</label>
               <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
                      v-on:keyup.enter="$parent.$parent.search()"
-                     condition="f_contract_number = '{}'">
+                     condition="f_contract_number like '%{}%'">
             </div>
             <div class="form-group col-sm-4">
               <label class="font_normal_body">报建类型：</label>

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

@@ -7,13 +7,13 @@
               <div class="form-group col-sm-4">
                 <label class="font_normal_body">项目名称:</label>
                 <input type="text" class="input_search" v-model="model.f_entry_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name = '{}'  " placeholder='请输入'>
+                       v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name 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"
                        v-on:keyup.enter="$parent.$parent.search()"
-                       condition="f_apply_num = '{}'">
+                       condition="f_apply_num like '%{}%'">
               </div>
               <div class="form-group col-sm-5 button-range">
                 <button class="button_new button_spacing" style="width: max-content"
@@ -34,7 +34,7 @@
                 <label class="font_normal_body">合同编号：</label>
                 <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
                        v-on:keyup.enter="$parent.$parent.search()"
-                       condition="f_apply_num = '{}'">
+                       condition="f_contract_number like '%{}%'">
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">报建类型：</label>

package/src/components/product/Process/Processes/InstallationDetails.vue

@@ -197,7 +197,7 @@
                 class="select select_list"
                 :value.sync="item.f_install_person"
                 v-model="item.f_install_person"
-                :options="installperson"
+                :options="installpersons"
                 :disable="mark === 1"
                 :valueSingle="true"></input-select>
             </div>
@@ -253,6 +253,7 @@ export default {
       meterbrands: [],      // 气表品牌
       useradders: null,
       userinfo: {},
+      installpersons:[],
       getfield: {
         'f_address': '地址',
         'f_meternumber': '表号',
@@ -271,6 +272,7 @@ export default {
   ready () {
     this.search()
     this.getMeterbrands()
+    this.installperson()
   },
   methods: {
     // 追加表具
@@ -430,6 +432,21 @@ export default {
         }
       }
     },
+    // 安装人
+    async installperson() {
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/search', {
+        source: "this.getParentByType($organization$).getChildByName($安全员$).getChildren()",
+        userid: this.$login.f.id
+      }, {resolveMsg: null, rejectMsg: null})
+
+      this.installpersons =  res.data.map(item =>{
+        return {
+          label: item.name,
+          value: item.name
+        }
+      })
+    },
     // 关闭安装明细
     closeUserFile() {
       this.showUserFile = false
@@ -464,15 +481,6 @@ export default {
       }
       return data
     },
-    // 安装人
-    installperson() {
-      return this.$login.f.f_installman.map(item => {
-        return {
-          label: item.name,
-          value: item.name
-        }
-      })
-    },
     // 表向
     aroundmeters() {
       return this.$appdata.getParam('左右表')

package/src/components/product/Process/Processes/addressAndUserinfoManagement.vue

@@ -1074,12 +1074,12 @@ export default {
             resolveMsg: null,
             rejectMsg: null
           })
-        if (resparent.data[i].defname === '营业厅建档' && resparent.data[i].state === '结束')
-          // let http3 = new HttpResetClass()
-          await http.load('POST', 'rs/logic/parentprocess', {data: {processid: resparent.data[i].processid, defname: resparent.data[i].defname}}, {
-            resolveMsg: null,
-            rejectMsg: null
-          })
+        // if (resparent.data[i].defname === '营业厅建档' && resparent.data[i].state === '结束')
+        //   // let http3 = new HttpResetClass()
+        //   await http.load('POST', 'rs/logic/parentprocess', {data: {processid: resparent.data[i].processid, defname: resparent.data[i].defname}}, {
+        //     resolveMsg: null,
+        //     rejectMsg: null
+        //   })
       }
         for (let i = 0; i < this.selectedData.length; i++) {
           let data = {

package/src/components/product/Process/Processes/chargeManagement.vue

@@ -113,7 +113,7 @@
         <div class="form-group col-sm-12" :class="charge.f_charge_money ? '':'has-error'">
           <label class="col-sm-2 control-label">收费金额：</label>
           <div class="col-sm-10">
-            <input type="number"
+            <input type="input"
                    class="form-control input_view"
                    style="width: 100%"
                    placeholder="0.00"

package/src/components/product/ServiceView.vue

@@ -546,7 +546,7 @@
         this.$dispatch('onblur', index)
         // 如果有错误信息提示走错误信息判断处理
 
-        if (this.data.fields[index].error || this.data.fields[index].type === 'datepicker') {
+        if (this.data.fields[index].error && this.data.fields[index].type === 'datepicker') {
           this.$dispatch('error_check', index)
         }
       },
@@ -569,7 +569,7 @@
         this.$dispatch('onchange', index)
 
         // 如果有错误信息提示走错误信息判断处理
-        if (this.data.fields[index].error || this.data.fields[index].type === 'datepicker') {
+        if (this.data.fields[index].error && this.data.fields[index].type === 'datepicker') {
           this.$dispatch('error_check', index)
         }
       },
@@ -580,7 +580,7 @@
         this.$dispatch('oninput', index)
 
         // 如果有错误信息提示走错误信息判断处理
-        if (this.data.fields[index].error || this.data.fields[index].type === 'datepicker') {
+        if (this.data.fields[index].error && this.data.fields[index].type === 'datepicker') {
           this.$dispatch('error_check', index)
         }
       },

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

@@ -7,19 +7,19 @@
             <div class="form-group col-sm-4">
               <label class="font_normal_body">项目名称:</label>
               <input type="text" class="input_search" v-model="model.f_entry_name"
-                     v-on:keyup.enter="search" condition=" f_entry_name = '{}' " placeholder='请输入'>
+                     v-on:keyup.enter="search" condition=" f_entry_name 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"
                      v-on:keyup.enter="search"
-                     condition="f_apply_num = '{}'">
+                     condition="f_apply_num 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_contract_number"
                    v-on:keyup.enter="search"
-                     condition="f_contract_number = '{}'">
+                     condition="f_contract_number like '%{}%'">
             </div>
             <div class="form-group col-sm-2 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>