manage-client 3.3.57 → 3.3.59

package/build/dev-server.js

@@ -10,82 +10,69 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-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://203.57.101.233:8400/'
-// var bendi = 'http://121.36.106.17:8400/'
-// var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://121.36.106.17:8400'
-// var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://121.36.106.17:8400'
-// 192.168.
-//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
-// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
+var local = 'http://121.36.106.17:8400'
+var server = 'http://121.36.106.17:8400'
 var proxyTable = {
   '/rs/logic/exportfile': {
-    target: bendi
+    target: server
   },
   '/files': {
-    target: bendi
+    target: server
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: bendi
+    target: server
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
-    target: bendi
+    target: server
   },
   // 查找资源服务数据
   '/rs/logic/getInitData': {
-    target: bendi
+    target: server
   },
   '/rs/logic/getSaleInitData': {
-    target: bendi
+    target: server
   },
   // 用户登录服务地址
   '/rs/user': {
-    target: bendi
+    target: server
   },
   '/rs/path/getParams': {
-    target: bendi
+    target: server
   },
   '/rs/data': {
-    target: bendi
+    target: server
   },
   '/rs/license': {
-    target: bendi
+    target: server
   },
   '/rs/db': {
-    target: bendi
+    target: server
   },
   '/excel': {
-    target: bendi
+    target: server
   },
   '/rs/config': {
-    target: bendi
+    target: server
   },
   '/rs/sql/getLicenseById': {
-    target: bendi
+    target: server
   },
   '/rs/report': {
-    target: bendi
+    target: server
   },
   '/rs/vue': {
-    target: bendi
+    target: server
   },
   '/rs/file': {
-    target: bendi
+    target: server
   },
   '/rs/sql/singleTable': {
-    target: bendi
+    target: server
   },
   '/rs': {
-    target: wode
+    target: server
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.57",
+  "version": "3.3.59",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -157,7 +157,7 @@
             </div>
           </div>
         </criteria>
-        <data-grid :model="model" class="list_area table_sy" id="queryinstruct" partial='list' v-ref:grid>
+        <data-grid :model="model" class="list_area table_sy" id="queryinstruct" partial='list' :modelval="$parent.$parent.modelval" v-ref:grid>
           <template partial='head'>
             <tr>
               <th style="text-align:center">
@@ -213,7 +213,15 @@
               <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>
             </tr>
           </template>
           <template partial='body'>
@@ -257,9 +265,9 @@
               </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">
+              <td style="text-align:center">
                 <nobr>{{row.f_collection}}</nobr>
-              </th>
+              </td>
               <td style="text-align:center">
                 <nobr>{{row.note}}</nobr>
               </td>
@@ -281,11 +289,24 @@
               <td style="text-align:center">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
+              <td style="text-align:center;">
+                <nobr>{{row.f_instruct_content}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.instructDetail(row)">指令详情</button>
+              </td>
             </tr>
           </template>
         </data-grid>
       </criteria-paged>
     </div>
+    <modal :show.sync="detailShow" v-if="detailShow" width="40%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <article slot="modal-body">
+        <p class="text-center" style="font-size: 15px" v-html="f_instruct_content"></p>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
@@ -342,16 +363,46 @@
             'f_orgname': '组织机构'
           }
         },
-        instructtitle: []
+        instructtitle: [],
+        detailShow: false,
+        f_instruct_content: '',
+        modelval: [
+          '序号','客户编号','客户名称','客户地址','表号','气表品牌','指令类型','指令标题','执行状态','执行结果','指令生成人','指令生成时间',
+          '指令发送时间','上表时间','充值金额','操作内容','操作原因','操作人(记录)','操作时间(记录)','操作类型','记录状态','组织机构'
+        ]
       }
     },
     ready () {
       readyGen(this)
       this.$refs.paged.$refs.criteria.model.f_start_date = Util.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.criteria.model.f_end_date = Util.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.grid.modelval = this.modelval
       //this.$refs.paged.$refs.criteria.search()
     },
     methods: {
+      instructDetail(row){
+        if (row.f_instruct_content != '{}') {
+          let data = JSON.parse(row.f_instruct_content)
+          console.log('看下具体的指令详情===>',data)
+          let str = ''
+          if (data.hasOwnProperty("Data")) {
+            console.log('看下具体的指令详情2===>',data.Data)
+            console.log('看下具体的指令详情2===>',typeof data.Data)
+            for (let key in data.Data) {
+              str =  str + key + ':' + data.Data[key] + '</br>'
+            }
+          }
+          for (let key in data) {
+            if (key != 'Data'){
+              str =  str + key + ':' + data[key] + '</br>'
+            }
+          }
+          this.f_instruct_content = str
+          this.detailShow = true
+        }else{
+          this.$showMessage('当前指令没有内容！！！', ['confirm'])
+        }
+      },
       hidden(){
         this.criteriaShow = !this.criteriaShow
       },
@@ -461,8 +512,11 @@
           this.f_orgid = `${this.f_orgid_new}`;
           //await this.$LoadParams.loadParam(this.f_orgid_new)
         }
-        this.model.search(args.condition, args.model)
-        this.initQueryParam();
+        await this.model.search(args.condition, args.model)
+        await this.initQueryParam();
+        await this.$refs.paged.$refs.grid.InitializedData()
+        await this.$refs.paged.$refs.grid.displayColumnSettings(undefined)
+
       },
 
     },

package/src/components/webmeter/reportdata/ReportDataQuery.vue

@@ -231,12 +231,6 @@
       //   // this.orgname = obj.res
       // },
       clear() {
-        //清空部门和人员
-        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
-        this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
-        //部门和人员变为全选
-        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
-        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
           this.$refs.paged.$refs.cri.model[key] = []
         })

package/src/filiale/WEINAN/CancellationQuery.vue

@@ -109,6 +109,50 @@
 <!--                            condition="f_operat_type = '{}'"-->
 <!--                            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_user_type"
+                            v-model="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :options='$parent.$parent.userTypes' placeholder='请选择'
+                            condition="f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
+                  <v-select :value.sync="model.f_user_usetype" :search="false"
+                            @change="$parent.$parent.userUseTypeChange()"
+                            v-model="model.f_user_usetype"
+                            :options='$parent.$parent.userusetypes'
+                            condition="f_user_usetype = '{}'"
+                            placeholder='用气类型'
+                            value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_use_institution" class="font_normal_body">用气机构</label>
+                  <v-select :value.sync="model.f_use_institution" :search="false"
+                            @change="$parent.$parent.userUseInstitutionChange()"
+                            v-model="model.f_use_institution"
+                            :options='$parent.$parent.useinstitutions'
+                            condition="f_use_institution = '{}'"
+                            placeholder='用气机构'
+                            value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_user_usenature" class="font_normal_body ">使用性质</label>
+                  <v-select :value.sync="model.f_user_usenature" :search="false"
+                            v-model="model.f_user_usenature"
+                            :options='$parent.$parent.userusenatures'
+                            condition="f_user_usenature = '{}'"
+                            placeholder='使用性质'
+                            value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -367,6 +411,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
           dep:[],
           user:[],
         },
+        userusetypes: [],
+        useinstitutions: [],
+        userusenatures: [],
         //合计数据
         sumsmodel: {},
         operattype:[{label: '全部', value: ''},{label: '销户', value: '销户'},{label: '销户启用', value: '销户启用'}],
@@ -382,6 +429,30 @@ import {HttpResetClass, PagedList} from 'vue-client'
       })
     },
     methods: {
+      userUseInstitutionChange () {
+        this.userusenatures = []
+        this.$refs.paged.$refs.cri.model.f_user_usenature = ''
+        if (this.$refs.paged.$refs.cri.model.f_use_institution) {
+          let str = this.$refs.paged.$refs.cri.model.f_use_institution + '使用性质'
+          this.userusenatures = this.$appdata.getParam(str)
+        }
+      },
+      userUseTypeChange () {
+        this.useinstitutions = []
+        this.$refs.paged.$refs.cri.model.f_use_institution = ''
+        if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
+          let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
+          this.useinstitutions = this.$appdata.getParam(str)
+        }
+      },
+      userTypeChange () {
+        this.userusetypes = []
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_use_institution = ''
+          let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
+          this.userusetypes = this.$appdata.getParam(str)
+        }
+      },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -615,6 +686,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
       },
     },
     computed: {
+      userTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
       getPricenames() {
         let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
         let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;

package/src/filiale/WEINAN/ChargeQuery.vue

@@ -280,6 +280,41 @@
                                   close-on-select :value-single="true" :search="false">
                         </v-select>
                     </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
+                    <v-select :value.sync="model.f_user_usetype" :search="false"
+                              @change="$parent.$parent.userUseTypeChange()"
+                              v-model="model.f_user_usetype"
+                              :options='$parent.$parent.userusetypes'
+                              condition="f_user_usetype = '{}'"
+                              placeholder='用气类型'
+                              value-single="true"
+                              close-on-select>
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="f_use_institution" class="font_normal_body">用气机构</label>
+                    <v-select :value.sync="model.f_use_institution" :search="false"
+                              @change="$parent.$parent.userUseInstitutionChange()"
+                              v-model="model.f_use_institution"
+                              :options='$parent.$parent.useinstitutions'
+                              condition="f_use_institution = '{}'"
+                              placeholder='用气机构'
+                              value-single="true"
+                              close-on-select>
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="f_user_usenature" class="font_normal_body ">使用性质</label>
+                    <v-select :value.sync="model.f_user_usenature" :search="false"
+                              v-model="model.f_user_usenature"
+                              :options='$parent.$parent.userusenatures'
+                              condition="f_user_usenature = '{}'"
+                              placeholder='使用性质'
+                              value-single="true"
+                              close-on-select>
+                    </v-select>
+                  </div>
                 </div>
               </div>
             </div>
@@ -508,6 +543,9 @@
           {label: '未优惠', value: '= 0'}
         ],
         showupload:false,
+        userusetypes: [],
+        useinstitutions: [],
+        userusenatures: [],
         selected:{},
           equip:[]
       }
@@ -529,7 +567,22 @@
 
     },
     methods: {
-
+      userUseInstitutionChange () {
+        this.userusenatures = []
+        this.$refs.paged.$refs.cri.model.f_user_usenature = ''
+        if (this.$refs.paged.$refs.cri.model.f_use_institution) {
+          let str = this.$refs.paged.$refs.cri.model.f_use_institution + '使用性质'
+          this.userusenatures = this.$appdata.getParam(str)
+        }
+      },
+      userUseTypeChange () {
+        this.useinstitutions = []
+        this.$refs.paged.$refs.cri.model.f_use_institution = ''
+        if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
+          let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
+          this.useinstitutions = this.$appdata.getParam(str)
+        }
+      },
         async equipment(){
             console.log('=========123123214124=============')
             let condition = `f_orgid = '${this.$login.f.orgid}'`
@@ -597,9 +650,13 @@
       },
       userTypeChange () {
         this.gasproperties=[]
+        this.userusetypes = []
         if(this.$refs.paged.$refs.cri.model !==null) {
           this.$refs.paged.$refs.cri.model.f_gasproperties=''
+          this.$refs.paged.$refs.cri.model.f_use_institution = ''
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
+          this.userusetypes = this.$appdata.getParam(str)
         }
         else{
           this.gasproperties =[{label: '全部', value: ''}]

package/src/filiale/WEINAN/DeviceQuery.vue

@@ -63,6 +63,7 @@
                     <label class="font_normal_body">客户类型</label>
                     <v-select :value.sync="model.f_user_type"
                               :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                              @change="$parent.$parent.userTypeChange()"
                               condition="f_user_type = '{}'"
                               close-on-select></v-select>
                   </div>
@@ -226,6 +227,41 @@
                     </v-select>
                   </div>
                   <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :show-component="['company','slicearea']"></res-select-group>
+                  <div class="col-sm-2 form-group">
+                    <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
+                    <v-select :value.sync="model.f_user_usetype" :search="false"
+                              @change="$parent.$parent.userUseTypeChange()"
+                              v-model="model.f_user_usetype"
+                              :options='$parent.$parent.userusetypes'
+                              condition="f_user_usetype = '{}'"
+                              placeholder='用气类型'
+                              value-single="true"
+                              close-on-select>
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="f_use_institution" class="font_normal_body">用气机构</label>
+                    <v-select :value.sync="model.f_use_institution" :search="false"
+                              @change="$parent.$parent.userUseInstitutionChange()"
+                              v-model="model.f_use_institution"
+                              :options='$parent.$parent.useinstitutions'
+                              condition="f_use_institution = '{}'"
+                              placeholder='用气机构'
+                              value-single="true"
+                              close-on-select>
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="f_user_usenature" class="font_normal_body ">使用性质</label>
+                    <v-select :value.sync="model.f_user_usenature" :search="false"
+                              v-model="model.f_user_usenature"
+                              :options='$parent.$parent.userusenatures'
+                              condition="f_user_usenature = '{}'"
+                              placeholder='使用性质'
+                              value-single="true"
+                              close-on-select>
+                    </v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -400,6 +436,9 @@
           org:[this.$login.f.orgid],
           slice_area: []
         },
+        userusetypes: [],
+        useinstitutions: [],
+        userusenatures: [],
         // 合计数据
         sumsmodel: {}
       }
@@ -412,6 +451,30 @@
       })
     },
     methods: {
+      userUseInstitutionChange () {
+        this.userusenatures = []
+        this.$refs.paged.$refs.cri.model.f_user_usenature = ''
+        if (this.$refs.paged.$refs.cri.model.f_use_institution) {
+          let str = this.$refs.paged.$refs.cri.model.f_use_institution + '使用性质'
+          this.userusenatures = this.$appdata.getParam(str)
+        }
+      },
+      userUseTypeChange () {
+        this.useinstitutions = []
+        this.$refs.paged.$refs.cri.model.f_use_institution = ''
+        if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
+          let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
+          this.useinstitutions = this.$appdata.getParam(str)
+        }
+      },
+      userTypeChange () {
+        this.userusetypes = []
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_use_institution = ''
+          let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
+          this.userusetypes = this.$appdata.getParam(str)
+        }
+      },
       async getinputtores () {
         // 获取抄表员
         let rs = []

package/src/filiale/WEINAN/DisableQuery.vue

@@ -133,6 +133,50 @@
                             close-on-select></v-select>
                 </div>
                 <res-select-group :initres="$parent.$parent.initres" :show-component="$parent.$parent.showCom" @re-res="$parent.$parent.getRes" :cascade =true v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            v-model="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :options='$parent.$parent.userTypes' placeholder='请选择'
+                            condition="f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
+                  <v-select :value.sync="model.f_user_usetype" :search="false"
+                            @change="$parent.$parent.userUseTypeChange()"
+                            v-model="model.f_user_usetype"
+                            :options='$parent.$parent.userusetypes'
+                            condition="f_user_usetype = '{}'"
+                            placeholder='用气类型'
+                            value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_use_institution" class="font_normal_body">用气机构</label>
+                  <v-select :value.sync="model.f_use_institution" :search="false"
+                            @change="$parent.$parent.userUseInstitutionChange()"
+                            v-model="model.f_use_institution"
+                            :options='$parent.$parent.useinstitutions'
+                            condition="f_use_institution = '{}'"
+                            placeholder='用气机构'
+                            value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_user_usenature" class="font_normal_body ">使用性质</label>
+                  <v-select :value.sync="model.f_user_usenature" :search="false"
+                            v-model="model.f_user_usenature"
+                            :options='$parent.$parent.userusenatures'
+                            condition="f_user_usenature = '{}'"
+                            placeholder='使用性质'
+                            value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -336,6 +380,9 @@
         //默认打印列
         defaultfield: [],
         tfoot: '',
+        userusetypes: [],
+        useinstitutions: [],
+        userusenatures: [],
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -356,6 +403,30 @@
       })
     },
     methods: {
+      userUseInstitutionChange () {
+        this.userusenatures = []
+        this.$refs.paged.$refs.cri.model.f_user_usenature = ''
+        if (this.$refs.paged.$refs.cri.model.f_use_institution) {
+          let str = this.$refs.paged.$refs.cri.model.f_use_institution + '使用性质'
+          this.userusenatures = this.$appdata.getParam(str)
+        }
+      },
+      userUseTypeChange () {
+        this.useinstitutions = []
+        this.$refs.paged.$refs.cri.model.f_use_institution = ''
+        if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
+          let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
+          this.useinstitutions = this.$appdata.getParam(str)
+        }
+      },
+      userTypeChange () {
+        this.userusetypes = []
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_use_institution = ''
+          let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
+          this.userusetypes = this.$appdata.getParam(str)
+        }
+      },
       view(row){
         this.showupload = true
         this.selected= row
@@ -506,6 +577,9 @@
       },
     },
     computed: {
+      userTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
       getCondition() {
         return {
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,