manage-client 3.2.242 → 3.2.244

package/package.json

@@ -1,17 +1,16 @@
 {
   "name": "manage-client",
-  "version": "3.2.242",
+  "version": "3.2.244",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
     "test": "test"
   },
   "dependencies": {
+    "crypto-js": "^4.1.1",
     "swiper": "^5.4.5"
   },
   "devDependencies": {
-    "compression-webpack-plugin": "1.1.2",
-    "terser-webpack-plugin-legacy": "^1.2.5",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
@@ -35,7 +34,7 @@
     "eslint-plugin-vue": "^0.1.1",
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^3.0.2",
+    "extract-text-webpack-plugin": "^1.0.1",
     "filemanager-webpack-plugin": "^2.0.5",
     "file-loader": "^0.8.4",
     "function-bind": "^1.0.2",
@@ -81,7 +80,7 @@
     "vue-strap": "^1.0.9",
     "vue-style-loader": "^1.0.0",
     "vue-validator": "2.1.7",
-    "webpack": "^3.12.0",
+    "webpack": "1.12.2",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3",

package/src/filiale/qianneng/QnJgqCbwlwZD.vue

@@ -46,7 +46,7 @@
                                   :field="$parent.$parent.getExportField"
                                   :footer="$parent.$parent.footer"
                                   :header="$parent.$parent.other"
-                                  sqlurl="rs/logic/exportfile" sql-name="qnJgqCbjbZD" template-name='物联网抄表报表导出'
+                                  sqlurl="rs/logic/exportfile" sql-name="qnJgqCbwlwZD" template-name='物联网抄表报表导出'
                                   :choose-col="true"></export-excel>
 
                     <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>

package/src/filiale/qianneng/QnJgqSfZD.vue

@@ -114,6 +114,9 @@
                   <th>
                     <nobr>表具类型</nobr>
                   </th>
+                  <th>
+                    <nobr>费用类型</nobr>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
@@ -171,6 +174,9 @@
                 <td style="text-align: center;">
                   <nobr>{{row.r_bjlx}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.z_fylx}}</nobr>
+                </td>
               </template>
               <template partial='foot'>
               </template>

package/src/filiale/qianneng/exportConfig.js

@@ -193,7 +193,7 @@ export default{
   },
   qnJgqSfZD:{
     'a_dabm':'档案编码','b_yhmc':'用户名称','c_dz':'地址','d_lxfs':'联系方式','e_yhlx':'用户类型','f_yqxz':'用气性质','g_jgmc':'价格名称','h_bh':'表号',
-    'i_qd':'起度','j_zd':'止度','k_ql':'气量','l_dj':'单价','m_ysje':'应收金额','n_ssje':'实收金额','o_sfsj':'收费时间','p_yd':'月度','q_sfy':'收费员','r_bjlx':'表具类型'
+    'i_qd':'起度','j_zd':'止度','k_ql':'气量','l_dj':'单价','m_ysje':'应收金额','n_ssje':'实收金额','o_sfsj':'收费时间','p_yd':'月度','q_sfy':'收费员','r_bjlx':'表具类型','z_fylx':'费用类型'
   },
 }
 

package/src/filiale/tongchuan/MeterQuery.vue

@@ -257,7 +257,14 @@
                               close-on-select
                               condition="f_meter_book_num = '{}'"></v-select>
                   </div>
-
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">客户状态</label>
+                    <v-select :value.sync="model.f_user_state"
+                              v-model="model.f_user_state"
+                              :options='$parent.$parent.userstates' placeholder='请选择'
+                              condition="f_user_state = '{}'"
+                              close-on-select></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -553,7 +560,8 @@
         tempfalg :false,
         lastorgstr:'',
         issecond: [{label:'是',value:" = '二次挂表'"},{label:'否',value:" <> '二次挂表'"}],
-        usetype:this.$appdata.getParam('使用类型')
+        usetype:this.$appdata.getParam('使用类型'),
+        userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : []
       }
     },
     ready() {