apply-clients 3.3.110-217 → 3.3.110-220

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.110-217",
+  "version": "3.3.110-220",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/android/Process/AppExplorationUser.vue

@@ -269,10 +269,10 @@ export default {
       showModal: false,
       applyType: '',  // 报建类型
       applyTypes:this.$appdata.getParam("手机报建类型"),
-      // applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'},{label:'团购报建',value:'团购报建'},{label:'改管报建',value:'改管报建'},{label:'增容报建',value:'增容报建'},{label:'退款报建',value:'退款报建'},{label:'团购转散户',value:'团购转散户'},{label:'报警器报建',value:'报警器报建'},{label:'工商业报警器报建',value:'工商业报警器报建'}],
+      applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'},{label:'团购报建',value:'团购报建'},{label:'改管报建',value:'改管报建'},{label:'增容报建',value:'增容报建'},{label:'退款报建',value:'退款报建'},{label:'团购转散户',value:'团购转散户'},{label:'报警器报建',value:'报警器报建'},{label:'工商业报警器报建',value:'工商业报警器报建'}],
       criteriaShow: false,
     //  applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
-      applytype: [{label: '全部', value: ''},  ...this.$appdata.getParam('报建类型') || [] ], // 所有报建类型
+      applytype: [{label: '全部', value: ''}, {label:'团购转散户',value:'团购转散户'} ], // 所有报建类型
       defnames: [{label: '全部', value: ''}],
       applyNatures: [{label: '全部', value: ''}], // 报建性质
       laterList: [
@@ -328,7 +328,7 @@ export default {
       this.$refs.cp.$refs.cri.search()
     },
     searchCondition (args) {
-      //args.condition += `and act.defname in ${this.appDefnames}`
+      args.condition += `and (f_apply_type !='团购转散户报建' and act.defname!='信息确认' )`
       this.model.search(args.condition, args.model)
     },
     click (row) {

package/src/components/product/Material/MaterialDetailed.vue

@@ -80,6 +80,12 @@
                        v-on:keyup.enter="$parent.$parent.search()"
                        condition="ma.f_material_number = '{}'">
               </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_bjq_sid"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_bjq_sid = '{}'">
+              </div>
               <div class="form-group col-sm-3">
                 <label  for="startDate" class="font_normal_body">开始时间：</label>
                 <datepicker id="startDate" placeholder="开始日期"
@@ -116,6 +122,7 @@
               <th>材料型号</th>
               <th>材料单位</th>
               <th>材料数量</th>
+              <th>报警器编号</th>
               <th>操作人</th>
               <th>操作时间</th>
             </tr>
@@ -146,6 +153,9 @@
               <td style="text-align: center;">
                 <nobr><font>{{row.f_material_number}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_bjq_sid}}</font></nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_operator}}</font></nobr>
               </td>

package/src/components/product/Process/Service/ServiceControl.vue

@@ -814,6 +814,9 @@ export default {
 
       let nature = 0    // 性质
       switch (this.show_data.f_apply_nature){
+        case '楼房':
+          nature = 1  // 当表达式的结果等于 楼房 时，则执行该代码
+          break;
         case '房产':
           nature = 1  // 当表达式的结果等于 房产 时，则执行该代码
           break;
@@ -851,7 +854,7 @@ export default {
         dataYm: dataYm,
         newYear: newYear,
         orgid: this.$login.f.orgid,
-        condition: `and f_apply_nature = '${this.show_data.f_apply_nature}'`
+        condition: `f_apply_nature = '${this.show_data.f_apply_nature}'`
       }
 
       let http = new HttpResetClass()

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -545,6 +545,27 @@
             value: item.id
           }
         })
+      },
+      // 获取区县
+      async getArea () {
+        let data = {
+          tablename: 't_area',
+          condition: `f_filialeid = '${this.$login.f.orgid}'`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+        )
+
+        return res.data.map(item => {
+          return {
+            label: item.f_residential_area,
+            value: item.f_residential_area
+          }
+        })
       }
     },
     events:{