manage-client 3.2.104 → 3.2.107

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

package/build/webpack.base.conf.js

@@ -40,6 +40,7 @@ module.exports = {
           `${projectRoot}\\node_modules\\vue-strap\\src`,
           `${projectRoot}\\node_modules\\system-clients\\src`,
           `${projectRoot}\\node_modules\\sale-client\\src`,
+          `${projectRoot}\\node_modules\\sale-client\\node_modules`,
           `${projectRoot}\\node_modules\\ldap-clients\\src`,
         ]
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.104",
+  "version": "3.2.107",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -66,7 +66,7 @@
     "system-clients": "3.1.89-20",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.33",
+    "vue-client": "1.24.50-1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",

package/src/components/daping/DataManagement.vue

@@ -3,10 +3,39 @@
 
     <div class="flex-row" style="height: 49%">
       <div id="top-left">
-<!--        <div class="flex background-left-bottom">-->
         <div class="flex">
-          <net-work-ping></net-work-ping>
+          <div class="flex" >
+            <div class="flex-row" style="height: 40%;margin-top: 2%;">
+              <div  class="auto col-sm-12" style="width: 40%;height: 100%;padding: 1em" >
+                <div class=" col-sm-12 auto" style="padding-left: 1em">
+                  <span class="font-title">安检</span>
+                </div>
+                <div  class="flex-inline col-sm-6 auto" >
+                  <span id="weiruhu">{{checkData.wrhsum > 10000 ? (checkData.wrhsum/10000).toFixed(0) + '万' : checkData.wrhsum}}</span>
+                </div>
+                <div  class="flex-inline col-sm-6 auto" >
+                  <span id="anjian">{{checkData.jhsum > 10000 ? (checkData.jhsum/10000).toFixed(0) + '万' : checkData.jhsum}}</span>
+                </div>
+                <div class="flex-inline col-sm-6 auto" >
+                  <span class="normal-font" >三年未入户总数</span>
+                </div>
+
+                <div class="flex-inline col-sm-6 auto" >
+                  <span class="normal-font" >计划安检量</span>
+                </div>
+              </div>
+              <div style="width: 60%">
+                <ring-safecheck-wh></ring-safecheck-wh>
+              </div>
+            </div>
+            <div  style="height: 58%">
+              <safe-check-wh></safe-check-wh>
+            </div>
+          </div>
+
         </div>
+<!--        <div class="flex background-left-bottom">-->
+
       </div>
       <div id="top-mid" >
         <div class="flex">
@@ -16,39 +45,9 @@
       </div>
       <div id="top-right" >
 
-          <div class="flex">
-
-            <div class="flex" >
-              <div class="flex-row" style="height: 40%;margin-top: 2%;">
-
-                <div  class="auto col-sm-12" style="width: 40%;height: 100%;padding: 1em" >
-                  <div class=" col-sm-12 auto" style="padding-left: 1em">
-                    <span class="font-title">安检</span>
-                  </div>
-                  <div  class="flex-inline col-sm-6 auto" >
-                    <span id="weiruhu">{{checkData.wrhsum > 10000 ? (checkData.wrhsum/10000).toFixed(0) + '万' : checkData.wrhsum}}</span>
-                  </div>
-                  <div  class="flex-inline col-sm-6 auto" >
-                    <span id="anjian">{{checkData.jhsum > 10000 ? (checkData.jhsum/10000).toFixed(0) + '万' : checkData.jhsum}}</span>
-                  </div>
-                  <div class="flex-inline col-sm-6 auto" >
-                    <span class="normal-font" >三年未入户总数</span>
-                  </div>
-
-                  <div class="flex-inline col-sm-6 auto" >
-                    <span class="normal-font" >计划安检量</span>
-                  </div>
-                </div>
-                <div style="width: 60%">
-                  <ring-safecheck-wh></ring-safecheck-wh>
-                </div>
-              </div>
-              <div  style="height: 58%">
-                <safe-check-wh></safe-check-wh>
-              </div>
-            </div>
-
-          </div>
+        <div class="flex">
+          <net-work-ping></net-work-ping>
+        </div>
         </div>
 
     </div>

package/src/components/sale/businessquery/BusinessManage.vue

@@ -94,6 +94,18 @@
     <tabs header="气费阶梯明细" v-if="permission('气费阶梯明细')">
       <selling-charge-price v-if="show.includes('气费阶梯明细')" @deal-msg="dealMsg" :data="data"></selling-charge-price>
     </tabs>
+    <tabs header="增值业务变更记录"  v-if="permission('增值业务变更记录')">
+      <valueadd-info-query @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></valueadd-info-query>
+    </tabs>
+    <tabs header="用户增值业务查询"  v-if="permission('用户增值业务查询')">
+      <valueadd-user-query  @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></valueadd-user-query>
+    </tabs>
+    <tabs header="增值业务续保查询"  v-if="permission('增值业务续保查询')">
+      <renewal-valueadd-user-query  @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></renewal-valueadd-user-query>
+    </tabs>
+    <tabs header="增值业务汇总查询"  v-if="permission('增值业务汇总查询')">
+      <valueadd-count-query  @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></valueadd-count-query>
+    </tabs>
   </tab-button>
   <!--  </div>-->
   <!--  <div v-if="!listpage">-->

package/src/components/sale/businessquery/FillCardQuery.vue

@@ -67,6 +67,19 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                          condition="f_address like '%{}%'" placeholder='客户地址'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">小&emsp;&emsp;区</label>
+                  <v-select :value.sync="model.f_residential_area"
+                            class="select_list select"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            multiple
+                            condition="f_residential_area in {}"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            close-on-select>
+
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">补卡类型</label>
                   <v-select :value.sync="model.f_type"
@@ -141,6 +154,9 @@
                   <data-order field="f_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
+                <th>
+                  <nobr>小区</nobr>
+                </th>
                 <th>
                   <nobr>卡号</nobr>
                 </th>
@@ -196,6 +212,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_card_id}}</nobr>
               </td>
@@ -268,7 +287,7 @@
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
+  import {HttpResetClass, PagedList} from 'vue-client'
   import defaultPrint from '../config/DefaultPrint'
   import exportConfig from '../config/exportConfig'
 
@@ -321,7 +340,8 @@
         tfoot: '',
         showupload:false,
         selected:{},
-
+        //小区
+        residentialArea: [],
         meterbrands: [],
         // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
 
@@ -332,6 +352,7 @@
       }
     },
     ready() {
+      this.getaddress()
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -389,6 +410,22 @@
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
       },
+      async  getaddress(){
+        console.log('开始获取小区')
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区',data)
+        let house = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          console.log('开始保存小区')
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
 
       clear() {
         //清空部门和人员