sale-client 3.6.242 → 3.6.246

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.242",
+  "version": "3.6.246",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/common/searchuploadfile/uploadFilesHistory.vue

@@ -148,9 +148,16 @@ export default {
                     i--
                     continue
                   }
+                  if ((res.data.array[j].fusetype == '安检照片' && res.data.array[j].f_filename.includes('amr'))) {
+                    continue
+                  }
                   let temp = res.data.array[j].f_downloadpath
                   let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
-                  res.data.array[j].f_downloadURL = 'http://' + location.host + '/' + URL
+                  if (res.data.array[j].fusetype == '安检照片') {
+                    res.data.array[j].f_downloadURL = 'http://' + location.host + '/rs/image/file/' + res.data.array[j].f_filename
+                  } else {
+                    res.data.array[j].f_downloadURL = 'http://' + location.host + '/' + URL
+                  }
                   this.files[i].arrays.push(res.data.array[j])
                 }
               }

package/src/components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser.vue

@@ -86,7 +86,7 @@
               <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_reason}}/{{row.f_othereason}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changetables_reason}}/{{row.f_reason}}/{{row.f_othereason}}</nobr></td>
             </tr>
           </template>
           <template partial='foot'></template>

package/src/components/revenue/comprehen/TotalSplit/AllUserFiles.vue

@@ -1,47 +1,56 @@
 <template>
-  <div class="flex" >
+  <div class="flex" style="flex: 1;">
     <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
-        <div novalidate class="form-inline" partial>
-          <div >
-            <input  type="number" class="form-control" v-model="model.f_userinfo_id" placeholder='客户编号'
-                    condition="f_userinfo_id = '{}'" v-next-el='yhxm'
-                    :size="model.f_userinfo_id ? model.f_userinfo_id.length  : 4">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">组织机构</label>
+              <res-select
+                restype='organization'
+                @res-select="$parent.$parent.getorg"
+                is-mul="false"
+                :initresid='$parent.$parent.curorgid'
+              >
+              </res-select>
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">客户编号</label>
+              <input  type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
+                      condition="f_userinfo_code = '{}'">
+            </div>
+            <div class="span" style="float:right;">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <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>
+            </div>
           </div>
-          <div >
-            <input  type="text" class="form-control" v-model="model.f_user_name" placeholder='客户名称'
-                    condition="f_user_name = '{}'" v-next-el='resentialarea' v-el:yhxm
-                    :size="model.f_user_name ? model.f_user_name.length  : 4">
-          </div>
-          <div >
-            <input type="text" class="form-control" v-model="model.f_area" placeholder='区域'
-                   condition="f_area like '%{}%'" v-el:xq v-next-el='cx' v-el:resentialarea
-                   :size="model.f_area ? model.f_area.length : 2">
-          </div>
-          <div >
-            <input  type="text" class="form-control" v-model="model.f_address" placeholder='客户地址'
-                    condition="f_address like '%{}%'" v-next-el='cx' v-el:resentialarea
-                    :size="model.f_address ? model.f_address.length * 2 : 4">
-          </div>
-          <div >
-            <input  type="text" class="form-control" v-model="model.f_meterbook_id" placeholder='表册号'
-                    condition="f_meterbook_id = '{}'"
-                    :size="model.f_meterbook_id ? model.f_meterbook_id.length : 2">
-          </div>
-          <div >
-            <button class="btn btn-success" @click="search()" v-el:cx>查询</button>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">客户名称</label>
+              <input  type="text" style="width:60%" class="input_search" v-model="model.f_user_name" placeholder='客户名称'
+                      condition="f_user_name like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">客户地址</label>
+              <input  type="text" style="width:60%" class="input_search" v-model="model.f_address" placeholder='客户地址'
+                      condition="f_address like '%{}%'">
+            </div>
+
           </div>
         </div>
       </criteria>
-      <data-grid  :model="model" partial='list' v-ref:grid>
+      <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid>
         <template partial='head'>
           <tr>
-            <th>序号</th>
-            <th>客户名称</th>
-            <th>表编号</th>
-            <th>表品牌</th>
-            <th>表型号</th>
-            <th>是否总表</th>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>客户名称</nobr></th>
+            <th><nobr>表编号</nobr></th>
+            <th><nobr>表品牌</nobr></th>
+            <th><nobr>表型号</nobr></th>
+            <th><nobr>是否总表</nobr></th>
           </tr>
         </template>
         <template partial='body'>
@@ -67,37 +76,37 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/singleTableOrderBy_WithView', 50, {orderitem: '"' + this.orderitem + '"',
-          items: '"' + this.items + '"',
-          tablename: '"' + this.tablename + '"'})
-      }
-    },
-    props: {
-      orderitem: {
-        type: String,
-        default: 'f_userinfo_id'
-      },
-      tablename: {
-        type: String,
-        default: 'V_user_table'
-      },
-      items: {
-        type: String,
-        default: "f_user_name, f_user_id, f_meter_brand, f_meter_style, case when f_totalsplit_type is null then '分表' else f_totalsplit_type end f_totalsplit_type"
+        model: new PagedList('rs/sql/getUserAndMeter', 30, {items: '"f_user_name, f_user_id, f_meter_brand, f_meter_style, case when f_totalsplit_type is null then \'分表\' else f_totalsplit_type end f_totalsplit_type"'}),
+        criteriaShow: false,
+        curorgid: [this.$login.f.orgid],
+        f_filialeid: this.$login.convertToIn(this.$login.f.orgid)
       }
     },
     ready () {
-      this.search({condition: '1=1', model: this.model})
+      this.search()
     },
     methods: {
-      // search () {
-      //   this.$refs.paged.$refs.criteria.search()
-      // },
-      search (args) {
-        args.condition = `${args.condition} and f_user_state = '正常'`
-        if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
-          args.condition = `${args.condition} and f_filialeids = '${this.$login.f.f_orgids}'`
+      getorg (val) {
+        this.f_filialeid = this.$login.convertToIn(val)
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      clear () {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearch (args) {
+        if (this.f_filialeid) {
+          args.condition = `f_filialeid in ${this.f_filialeid} and ${args.condition}`
         }
+        console.log('----------2222222---------------')
+        console.log(args)
+        console.log('------------22222222-------------')
         this.model.search(args.condition, args.model)
       },
       defined () {

package/src/components/revenue/comprehen/TotalSplit/SplitList.vue

@@ -1,45 +1,60 @@
 <template>
   <div class="span" >
     <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
-        <div novalidate class="form-inline" partial>
-          <div >
-            <input  type="number" class="form-control" v-model="model.f_userinfo_id" placeholder='客户编号'
-                    condition="f_userinfo_id = '{}'" v-next-el='yhxm'
-                    :size="model.f_userinfo_id ? model.f_userinfo_id.length  : 4">
-          </div>
-          <div >
-            <input  type="text" class="form-control" v-model="model.f_user_name" placeholder='客户名称'
-                    condition="f_user_name = '{}'" v-next-el='resentialarea' v-el:yhxm
-                    :size="model.f_user_name ? model.f_user_name.length  : 4">
-          </div>
-          <div >
-            <input  type="text" class="form-control" v-model="model.f_address" placeholder='客户地址'
-                    condition="f_address like '%{}%'" v-next-el='cx' v-el:resentialarea
-                    :size="model.f_address ? model.f_address.length * 2 : 4">
-          </div>
-          <div >
-            <input  type="text" class="form-control" v-model="model.f_meterbook_id" placeholder='表册号'
-                    condition="f_meterbook_id = '{}'"
-                    :size="model.f_meterbook_id ? model.f_meterbook_id.length : 2">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearchsplit' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">组织机构</label>
+              <res-select
+                restype='organization'
+                @res-select="$parent.$parent.getorgfen"
+                is-mul="false"
+                :initresid='$parent.$parent.curorgidfen'
+              >
+              </res-select>
+            </div>
+
+            <div class="span" style="float:right;">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.addToTotal()" >添加至总表</button>
+              <div style="float: right"  class="button_spacing"
+                   :class="{'button_shrink_top':$parent.$parent.criteriaShowfen,'button_shrink_bottom':!$parent.$parent.criteriaShowfen}"
+                   @click="$parent.$parent.hiddenfen()"></div>
+            </div>
           </div>
-          <div >
-            <button class="btn btn-success" @click="search()" >查询</button>
-            <button class="btn btn-primary" @click="$parent.$parent.addToTotal()" >添加至总表</button>
+
+          <div class="row" v-show="$parent.$parent.criteriaShowfen">
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">客户编号</label>
+              <input  type="text" style="width:60%"  class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
+                      condition="f_userinfo_code = '{}'">
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">客户名称</label>
+              <input  type="text" style="width:60%"  class="input_search" v-model="model.f_user_name" placeholder='客户名称'
+                      condition="f_user_name like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">客户地址</label>
+              <input  type="text" style="width:60%"  class="input_search" v-model="model.f_address" placeholder='客户地址'
+                      condition="f_address like '%{}%'">
+            </div>
           </div>
         </div>
       </criteria>
-      <data-grid  :model="model" partial='list' v-ref:grid>
+      <data-grid  :model="model" class="list_area table_sy"  partial='list' v-ref:grid>
         <template partial='head'>
           <tr>
             <th>
               <input type="checkbox"  @click="$parent.$parent.$parent.isAll(model.pageIndex)">
             </th>
-            <th>序号</th>
-            <th>客户名称</th>
-            <th>表编号</th>
-            <th>表品牌</th>
-            <th>表型号</th>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>客户名称</nobr></th>
+            <th><nobr>表编号</nobr></th>
+            <th><nobr>表品牌</nobr></th>
+            <th><nobr>表型号</nobr></th>
             <!-- <th>是否总表</th> -->
           </tr>
         </template>
@@ -139,38 +154,43 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/singleTableOrderBy_WithView', 50, {orderitem: '"' + this.orderitem + '"',
-          items: '"' + this.items + '"',
-          tablename: '"' + this.tablename + '"'}),
+        model: new PagedList('rs/sql/getUserAndMeter', 30, {items: '"f_address,f_userinfo_code,f_user_name,f_user_id,f_meter_brand,f_meter_style"'}),
         shareratio: false,
         selectedDatas: [],
-        pages: []
+        pages: [],
+        criteriaShowfen: false,
+        curorgidfen: [this.$login.f.orgid],
+        f_filialeid: this.$login.convertToIn(this.$login.f.orgid)
       }
     },
     props: {
-      data: ['data'],
-      orderitem: {
-        type: String,
-        default: 'f_userinfo_id'
-      },
-      tablename: {
-        type: String,
-        default: 'V_user_table'
-      },
-      items: {
-        type: String,
-        default: 'f_user_name,f_user_id,f_meter_brand,f_meter_style'
-      }
+      data: ['data']
     },
     ready () {
-      this.search({condition: '1=1', model: this.model})
+      this.search()
     },
     methods: {
-      search (args) {
-        args.condition = `${args.condition} and f_totalsplit_type is null`
-        if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
-          args.condition = `${args.condition} and f_filialeids = '${this.$login.f.f_orgids}'`
+      getorgfen (val) {
+        this.f_filialeid = this.$login.convertToIn(val)
+      },
+      clear () {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      hiddenfen () {
+        this.criteriaShowfen = !this.criteriaShowfen
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearchsplit (args) {
+        if (this.f_filialeid) {
+          args.condition = `f_filialeid in ${this.f_filialeid} and ${args.condition}`
         }
+        console.log('-------------------------')
+        console.log(args)
+        console.log('-------------------------')
         this.model.search(args.condition, args.model)
       },
       isAll (page) {

package/src/components/revenue/comprehen/TotalSplit/TotalSplitList.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="span">
-    <data-grid :model="model" partial='list' v-ref:grid>
+    <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
       <template partial='head'>
         <tr>
-          <th>序号</th>
-          <th>总表编号</th>
-          <th>客户名称</th>
-          <th>表编号</th>
-          <th>表品牌</th>
-          <th>表型号</th>
-          <th>承担比率</th>
-          <th>操作</th>
+          <th><nobr>序号</nobr></th>
+          <th><nobr>总表编号</nobr></th>
+          <th><nobr>客户名称</nobr></th>
+          <th><nobr>表编号</nobr></th>
+          <th><nobr>表品牌</nobr></th>
+          <th><nobr>表型号</nobr></th>
+          <th><nobr>承担比率</nobr></th>
+          <th><nobr>操作</nobr></th>
         </tr>
       </template>
       <template partial='body'>
@@ -51,11 +51,9 @@
   let getUpdateGen = function * (self, id, direct) {
     let data = {
       items: 'f_user_id,f_user_name,f_meter_brand,f_meter_style,f_share_ratio',
-      condition: 'f_meter_id =' + "'" + id + "'",
-      tablename: 'V_user_table',
-      orderitem: 'f_user_id'
+      condition: 'f_meter_id =' + "'" + id + "'"
     }
-    let queryData = yield self.$SqlService.singleTableOrderBy(data)
+    let queryData = yield self.$SqlService.getUserAndMeter(data)
     console.log('总表查询分表数据，，，，', queryData)
     queryData.data.forEach((item) => {
       item.total_id = id

package/src/components/revenue/comprehen/TotalSplit/TotalSplitManage.vue

@@ -28,6 +28,7 @@
     },
     methods: {
       selected (obj) {
+        console.log(obj)
         console.log('我还没选你就给我默认了？？？')
         this.row = obj.val
       },
@@ -37,7 +38,7 @@
       },
       refreshAllUser () {
         this.$refs.alluser.$refs.paged.$refs.cri.search()
-        this.$refs.split.search({items: '*', condition: '1=1', tablename: 'V_user_table', orderitem: 'f_userinfo_id'})
+        this.$refs.split.search()
         this.$refs.split.ids = []
       }
     }

package/src/components/revenue/machineHandManage/HandplanQuery.vue

@@ -145,11 +145,14 @@
                             close-on-select v-ref:type>
                   </v-select>
                 </div>
-                <div class="col-sm-2 form-group">
+                <div class="form-group col-sm-2">
                   <label class="font_normal_body">气价名称</label>
-                  <v-select :value.sync="model.f_price_name"
-                            v-model="model.f_price_name"
-                            :options="$parent.$parent.getPricenames"
+                  <v-select id="f_price_name"
+                            v-model="model.price_name"
+                            placeholder='气价名称'
+                            style="width: 60%"
+                            :value.sync="model.price_name"
+                            :options='$parent.$parent.priceNames'
                             condition="f_price_name = '{}'"
                             close-on-select></v-select>
                 </div>
@@ -721,6 +724,7 @@
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     await self.$LoadParams.loadParam()
     self.initParams()
+    self.getPricenames()
     console.log('开始查询')
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
@@ -761,6 +765,7 @@
         modelval: [],
         gasproperties: [],
         inputtouPerson: [],
+        priceNames: [],
         meterbrands: [],
         printshow: false,
         f_filialeid: this.$login.f.f_orgid,
@@ -865,6 +870,22 @@
       })
     },
     methods: {
+      getPricenames () {
+        let filialeid = this.$login.f.orgid
+        let result = [{label: '全部', value: ''}]
+        console.log('this.$GetSaleParam.prices', this.$GetSaleParam)
+        console.log('filialeid', filialeid)
+        this.$GetSaleParam.prices.forEach((item) => {
+          if (item.f_state === '有效' && filialeid == item.f_filialeid) {
+            let value = {
+              label: item.f_price_name,
+              value: item
+            }
+            result.push(value)
+          }
+        })
+        this.priceNames = Array.from(new Set(result))
+      },
       loadMeterBooks () {
         this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
       },

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -163,17 +163,17 @@
                          condition="f_oughtamount <= {} " placeholder="">
                 </div>
               </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">审核状态</label>
-                <v-select :value.sync="model.f_audit_state_1"
-                          class="select_list select"
-                          v-model="model.f_audit_state_1"
-                          style="width: 60%"
-                          condition="f_audit_state = '{}'"
-                          :options='$parent.$parent.auditState1' placeholder='请选择'
-                          close-on-select v-el:cc>
-                </v-select>
-              </div>
+<!--              <div class="col-sm-2 form-group">-->
+<!--                <label class="font_normal_body">审核状态</label>-->
+<!--                <v-select :value.sync="model.f_audit_state_1"-->
+<!--                          class="select_list select"-->
+<!--                          v-model="model.f_audit_state_1"-->
+<!--                          style="width: 60%"-->
+<!--                          condition="f_audit_state = '{}'"-->
+<!--                          :options='$parent.$parent.auditState1' placeholder='请选择'-->
+<!--                          close-on-select v-el:cc>-->
+<!--                </v-select>-->
+<!--              </div>-->
               <!--              <div class="col-sm-2 form-group">-->
               <!--                <label class="font_normal_body">调压箱名</label>-->
               <!--                <v-select :value.sync="model.f_adjustable_name" v-model="model.f_adjustable_name"-->