manage-client 4.0.90 → 4.0.92

package/build/dev-server.js

@@ -15,11 +15,11 @@ var shaoguan = 'http://119.146.1.106:8300/'
 var qtx = 'http://36.103.222.144:6300/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001/'
+var bendi = 'http://172.168.1.11:8400/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://203.57.101.233:9001/'
+// var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://119.187.112.234:8400/'
 var wode = 'http://203.57.101.233:9001/'
 // 192.168.
@@ -30,37 +30,31 @@ var proxyTable = {
     target: bendi
   },
   '/dataManage': {
-    target: 'http://203.57.101.233:9001/'
+    target: bendi
 
   },
-  '/api/af-revenue/sql/WeChatPaydetail': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
-  },
-  '/api/af-revenue/sql/WeChatPayment': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
+  '/api/af-revenue/sql/compreQuery': {
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: bendi
   },
   '/api': {
-    target: 'http://192.168.50.67:31567/'
+    target: bendi
 
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
-    target: 'http://localhost:8084/'
+    target: bendi
   },
   '/rs/logic/chargeQuery_by_gasproperties_line': {
-    target: 'http://localhost:8084/'
+    target: bendi
   },
   '/files': {
     target: bendi
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: 'http://192.168.50.67:31567/'
+    target: bendi
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
@@ -102,7 +96,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/vue': {
-    target: 'http://192.168.50.67:31567/'
+    target: bendi
   },
   '/rs/file': {
     target: bendi
@@ -111,7 +105,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs': {
-    target: wode
+    target: bendi
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.0.90",
+    "version": "4.0.92",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {
@@ -67,7 +67,7 @@
         "style": "0.0.3",
         "style-loader": "^0.20.3",
         "swiper": "^5.4.5",
-        "system-clients": "3.3.2",
+        "system-clients": "3.2.61",
         "ldap-clients": "3.0.96",
         "url-loader": "^0.5.7",
         "vue-amap": "0.5.10",

package/src/filiale/WEINAN/webmeter/NewQueryInstruct.vue

@@ -224,16 +224,12 @@
               <th style="text-align:center">
                 <nobr>指令类型</nobr>
               </th>
-              <th style="text-align:center">
-                <nobr>指令标题</nobr>
-              </th>
+
               <th style="text-align:center">
                 <nobr>执行状态</nobr>
               </th>
               <th style="text-align:center"><nobr>执行结果</nobr></th>
-              <th style="text-align:center"><nobr>指令生成人</nobr></th>
               <th style="text-align:center"><nobr>指令生成时间</nobr></th>
-              <th style="text-align:center"><nobr>指令发送时间</nobr></th>
               <th style="text-align:center"><nobr>上表时间</nobr></th>
               <th style="text-align:center">
                 <nobr>充值金额</nobr>
@@ -283,22 +279,15 @@
               <td style="text-align:center">
                 <nobr>{{row.f_instruct_type}}</nobr>
               </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_instruct_title}}</nobr>
-              </td>
               <td style="text-align:center">
                 <nobr>{{row.f_instruct_state}}</nobr>
               </td>
               <td style="text-align:center">
                 <nobr>{{row.f_receive_state}}</nobr>
               </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_inputtor}}</nobr>
-              </td>
               <td style="text-align:center">
                 <nobr>{{row.f_instruct_date}}</nobr>
               </td>
-              <td style="text-align:center"><nobr>{{row.f_send_date}}</nobr></td>
               <td style="text-align:center"><nobr>{{row.f_callback_date}}</nobr></td>
               <th style="text-align:center">
                 <nobr>{{row.f_collection}}</nobr>
@@ -382,7 +371,7 @@
           excelHeaders: {
             'f_userinfo_code': '客户编号','f_address': '客户地址','f_user_name': '客户姓名',
             'f_meternumber': '表号','f_meter_brand': '气表品牌','f_instruct_type': '指令类型',
-            'f_instruct_state': '执行状态','f_receive_state': '执行结果','f_inputtor': '指令生成人','f_instruct_date': '指令时间',
+            'f_instruct_state': '执行状态','f_receive_state': '执行结果','f_instruct_date': '指令时间',
             'note':'操作内容','f_info':'操作原因','f_operator':'操作人(记录)','f_operate_date':'操作时间(记录)','f_operate_type':'操作类型','f_state':'操作状态',
             'f_orgname': '组织机构'
           }

package/src/filiale/rongcheng/RecordInfoQuery.vue

@@ -337,6 +337,14 @@
                               close-on-select
                               condition="f_usetype = '{}'"></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">是否换表安检</label>
+                    <v-select :value.sync="model.f_ischange_check" v-model="model.f_ischange_check"
+                              :options='$parent.$parent.ischangecheck' placeholder='请选择'
+                              style="width:60%"
+                              close-on-select
+                              condition="f_ischange_check = '{}' "></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -402,6 +410,7 @@
 
                   <th><nobr>气表型号</nobr></th>
                   <th><nobr>表状态</nobr></th>
+                  <th><nobr>是否换表安检</nobr></th>
                   <th><nobr>初始气表底数</nobr></th>
                   <th><nobr>累计用气金额</nobr></th>
                   <th><nobr>表累购气量</nobr></th>
@@ -492,6 +501,7 @@
 
                 <td style="text-align: center;"><nobr>{{row.f_meter_style}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_ischange_check}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_initial_base}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_total_usegas_amount}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_total_gas}}</nobr></td>
@@ -576,6 +586,7 @@ let readySomething = async function (self) {
   // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
   // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
   // await self.$refs.paged.$refs.cri.search()
+  self.$refs.paged.$refs.cri.model.f_ischange_check = ['否']
 }
 export default {
   data() {
@@ -681,7 +692,7 @@ export default {
       this.show=true
     },
     selfSearch (args) {
-
+      console.log('看看选择框',this.$refs.paged.$refs.cri.model.f_table_state)
       //抄表员查询条件
       this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
       if(this.inputtouPerson.length !== 0){
@@ -736,6 +747,7 @@ export default {
       Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
         this.$refs.paged.$refs.cri.model[key] = []
       })
+      this.$refs.paged.$refs.cri.model.f_ischange_check = ['否']
     },
     hidden(){
       this.criteriaShow = !this.criteriaShow
@@ -825,6 +837,9 @@ export default {
     usetypes() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
     },
+    ischangecheck() {
+      return [{label: '否', value: '否'},{label: '是', value: '是'}]
+    },
     zbf() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('自闭阀')]
     },

package/src/filiale/rongcheng/exportConfig.js

@@ -171,6 +171,7 @@ export default {
     'f_meter_style': '气表型号',
     'f_meter_type': '气表类型',
     'f_table_state': '表状态',
+    'f_ischange_check ': '是否换表安检',
     'f_initial_base': '初始气表底数',
     'f_meter_base': '气表底数',
     'f_total_usegas_amount': '累计用气金额',

package/src/filiale/shanxian/FmyGasDeviceQuery.vue

@@ -488,16 +488,16 @@
                   <nobr>{{row.f_checker_name}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_total_gas}}</nobr>
+                  <nobr>{{row.f_defect_content?row.f_total_gas:''}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.c}}</nobr>
+                  <nobr>{{row.f_defect_content?row.c:''}}</nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{$parent.$parent.$parent.getContent(row.f_defect_content)}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_repair_date}}</nobr>
+                  <nobr>{{row.f_defect_content?row.f_repair_date:''}}</nobr>
                 </td>
 
                 <td style="text-align: center;">
@@ -635,7 +635,7 @@
       getContent(defectContent){
 
         if(defectContent =='' || defectContent == null){
-          return '正常'
+          return '未知'
         }
         const defectData = JSON.parse(defectContent);
         if (defectData.result === '正常') {