manage-client 3.1.8-aode → 3.1.8-ls

package/src/stores/DrillSql.js

@@ -56,7 +56,7 @@ export function getDrillParameter(title, idname, param1, param2) {
             {
               label: "按年分类", value: Math.random(), name: 'year', echartsType: 'bar', dateif: false, namesubif: false,
               xname: '年', yname: '数量', seriename: '', dateparam: "f_createfile_date",
-              sqlcondition:'useryear', listparam: '',
+              sqlcondition: 'useryear', listparam: '',
             },
             //按月分类
             {
@@ -104,7 +104,7 @@ export function getDrillParameter(title, idname, param1, param2) {
           xname: '', yname: '用气量',
           seriename: '用气量',
           dateparam: "a.f_delivery_date",
-          sqlcondition:'mainuser',
+          sqlcondition: 'mainuser',
           children: [],
           inputchildren: ''
         },
@@ -239,47 +239,103 @@ export function getDrillParameter(title, idname, param1, param2) {
       lossassociation: [
         {
           label: "全部",
-          value: Math.random(),
-          name: 'ti.f_user_type is not null ',
+          value: "全部",
+          name: 'f_user_type is not null ',
           echartsType: 'bar',
           barparamif: false,
           listif: false,
           dateif: true,
           namesubif: false,
-          xname: '月', yname: '客户数', seriename: '客户数',
-          dateparam: "al.f_hand_date",
-          sqlcondition:'lossassociation',
+          xname: '天', yname: '客户数', seriename: '客户数',
+          dateparam: "slday",
+          sqlcondition: 'lossassociation',
           children: [],
           inputchildren: '',
         },
         {
           label: "民用",
-          value: Math.random(),
-          name: 'ti.f_user_type=\'民用\'',
+          value: "民用",
+          name: 'f_user_type=\'民用\'',
           echartsType: 'bar',
           barparamif: false,
           listif: false,
           dateif: true,
           namesubif: false,
-          xname: '月', yname: '客户数', seriename: '民用',
-          dateparam: "al.f_hand_date",
+          xname: '天', yname: '客户数', seriename: '民用',
+          dateparam: "slday",
           sqlcondition: 'lossassociation',
-          children: [],
+          children: [
+            //子列表
+            {
+              label: "居民用气",
+              value: "居民用气",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              xname: '天', yname: '客户数', seriename: '客户数',
+              name: 'f_gasproperties =\'居民用气\'',
+              sqlcondition: 'lossassociation',
+              dateparam: "f_gasproperties"
+            },
+            {
+              label: "居民地暖",
+              value: "居民地暖",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              xname: '天', yname: '客户数', seriename: '客户数',
+              name: 'f_gasproperties =\'居民地暖\'',
+              sqlcondition: 'lossassociation',
+              dateparam: "f_gasproperties"
+
+            }],
           inputchildren: '',
         },
         {
           label: "非民用",
-          value: Math.random(),
-          name: 'ti.f_user_type=\'非民用\'',
+          value: "非民用",
+          name: 'f_user_type=\'非民用\'',
           echartsType: 'bar',
           barparamif: false,
           listif: false,
           dateif: true,
           namesubif: false,
-          xname: '月', yname: '客户数', seriename: '民用',
-          dateparam: "al.f_hand_date",
+          xname: '天', yname: '客户数', seriename: '民用',
+          dateparam: "slday",
           sqlcondition: 'lossassociation',
-          children: [],
+          children: [
+            //子列表
+            {
+              label: "商业用气",
+              value: "商业用气",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              xname: '天', yname: '客户数', seriename: '客户数',
+              namesubif: false,
+              name: 'f_gasproperties =\'商业用气\'',
+              sqlcondition: 'lossassociation',
+              dateparam: "f_gasproperties"
+            },
+            {
+              label: "工业用气",
+              value: "工业用气",
+              echartsType: 'bar',
+              barparamif: false,
+              xname: '天', yname: '客户数', seriename: '客户数',
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              name: 'f_gasproperties =\'工业用气\'',
+              sqlcondition: 'lossassociation',
+              dateparam: "f_gasproperties"
+
+            }],
           inputchildren: '',
         }
       ],
@@ -287,14 +343,14 @@ export function getDrillParameter(title, idname, param1, param2) {
       longnotusegas: [
         {
           label: "全部",
-          value: Math.random(),
-          name: 'ti.f_user_type is not null',
+          value: "全部",
+          name: 'a.f_user_type is not null',
           echartsType: 'bar',
           barparamif: false,
           listif: false,
           dateif: true,
           namesubif: false,
-          xname: '月', yname: '用户数', seriename: '用户数',
+          xname: '日', yname: '用户数', seriename: '用户数',
           dateparam: "f_hand_date",
           sqlcondition: 'longnotusegas',
           children: [],
@@ -302,32 +358,88 @@ export function getDrillParameter(title, idname, param1, param2) {
         },
         {
           label: "民用",
-          value: Math.random(),
-          name: 'ti.f_user_type=\'民用\'',
+          value: "民用",
+          name: 'a.f_user_type=\'民用\'',
           echartsType: 'bar',
           barparamif: false,
           listif: false,
           dateif: true,
           namesubif: false,
-          xname: '月', yname: '用户数', seriename: '民用',
+          xname: '日', yname: '用户数', seriename: '民用',
           dateparam: "f_hand_date",
-          sqlcondition:'longnotusegas',
-          children: [],
+          sqlcondition: 'longnotusegas',
+          children: [
+            //子列表
+            {
+              label: "居民用气",
+              value: "居民用气",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              xname: '天', yname: '客户数', seriename: '客户数',
+              name: 'a.f_gasproperties =\'居民用气\'',
+              sqlcondition: 'longnotusegas',
+              dateparam: "f_gasproperties"
+            },
+            {
+              label: "居民地暖",
+              value: "居民地暖",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              xname: '天', yname: '客户数', seriename: '客户数',
+              name: 'a.f_gasproperties =\'居民地暖\'',
+              sqlcondition: 'longnotusegas',
+              dateparam: "f_gasproperties"
+
+            }],
           inputchildren: '',
         },
         {
           label: "非民用",
-          value: Math.random(),
-          name: 'ti.f_user_type=\'非民用\'',
+          value: "非民用",
+          name: 'a.f_user_type=\'非民用\'',
           echartsType: 'bar',
           barparamif: false,
           listif: false,
           dateif: true,
           namesubif: false,
           xname: '月', yname: '用户数', seriename: '非民用',
-          dateparam: "f_delivery_date",
+          dateparam: "f_hand_date",
           sqlcondition: 'longnotusegas',
-          children: [],
+          children: [
+            //子列表
+            {
+              label: "商业用气",
+              value: "商业用气",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              name: 'a.f_gasproperties =\'商业用气\'',
+              xname: '天', yname: '客户数', seriename: '客户数',
+              sqlcondition: 'longnotbuygas',
+              dateparam: "f_gasproperties"
+            },
+            {
+              label: "工业用气",
+              value: "工业用气",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              name: 'a.f_gasproperties =\'工业用气\'',
+              xname: '天', yname: '客户数', seriename: '客户数',
+              sqlcondition: 'longnotbuygas',
+              dateparam: "f_gasproperties"
+
+            }],
           inputchildren: '',
         },
       ],
@@ -335,14 +447,14 @@ export function getDrillParameter(title, idname, param1, param2) {
       longnotbuygas: [
         {
           label: "全部",
-          value: Math.random(),
-          name: 'ti.f_user_type is not null',
+          value: "全部",
+          name: 'a.f_user_type is not null',
           echartsType: 'bar',
           barparamif: false,
           listif: false,
           dateif: true,
           namesubif: false,
-          xname: '月', yname: '用户数', seriename: '',
+          xname: '日', yname: '用户数', seriename: '',
           dateparam: "f_delivery_date",
           sqlcondition: 'longnotbuygas',
           children: [],
@@ -350,31 +462,88 @@ export function getDrillParameter(title, idname, param1, param2) {
         },
         {
           label: "民用",
-          value: Math.random(),
-          name: 'ti.f_user_type=\'民用\'',
+          value: "民用",
+          name: 'a.f_user_type=\'民用\'',
           echartsType: 'bar',
           barparamif: false,
           listif: false,
           dateif: true,
           namesubif: false,
-          xname: '月', yname: '用户数', seriename: '',
+          xname: '日', yname: '用户数', seriename: '',
           dateparam: "f_delivery_date",
           sqlcondition: 'longnotbuygas',
-          children: [],
+          children: [
+            //子列表
+            {
+              label: "居民用气",
+              value: "居民用气",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              xname: '天', yname: '客户数', seriename: '客户数',
+              name: 'a.f_gasproperties =\'居民用气\'',
+              sqlcondition: 'longnotbuygas',
+              dateparam: "f_gasproperties"
+            },
+            {
+              label: "居民地暖",
+              value: "居民地暖",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              xname: '天', yname: '客户数', seriename: '客户数',
+              name: 'a.f_gasproperties =\'居民地暖\'',
+              sqlcondition: 'longnotbuygas',
+              dateparam: "f_gasproperties"
+
+            }],
           inputchildren: '',
-        }, {
+        },
+        {
           label: "非民用",
-          value: Math.random(),
-          name: 'ti.f_user_type=\'非民用\'',
+          value: "非民用",
+          name: 'a.f_user_type=\'非民用\'',
           echartsType: 'bar',
           barparamif: false,
           listif: false,
           dateif: true,
           namesubif: false,
-          xname: '月', yname: '用户数', seriename: '',
+          xname: '日', yname: '用户数', seriename: '',
           dateparam: "f_delivery_date",
           sqlcondition: 'longnotbuygas',
-          children: [],
+          children: [
+            //子列表
+            {
+              label: "商业用气",
+              value: "商业用气",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              xname: '天', yname: '客户数', seriename: '客户数',
+              name: 'a.f_gasproperties =\'商业用气\'',
+              sqlcondition: 'longnotbuygas',
+              dateparam: "f_gasproperties"
+            },
+            {
+              label: "工业用气",
+              value: "工业用气",
+              echartsType: 'bar',
+              barparamif: false,
+              listif: false,
+              dateif: true,
+              namesubif: false,
+              xname: '天', yname: '客户数', seriename: '客户数',
+              name: 'a.f_gasproperties =\'工业用气\'',
+              sqlcondition: 'longnotbuygas',
+              dateparam: "f_gasproperties"
+
+            }],
           inputchildren: '',
         },
       ],
@@ -391,13 +560,20 @@ export function getDrillParameter(title, idname, param1, param2) {
           listif: false,
           dateif: true,
           dateparam: "f_delivery_date",
-          sqlcondition:'pastscaleall',
+          sqlcondition: 'pastscaleall',
           children: [
             //子列表
             //高于往期购气量
             {
-              label: "高于往期购气量", value: Math.random(),         name: 'ti.f_user_type is not null', echartsType: 'bar', dateif: true, namesubif: false,
-              xname: '月', yname: '用户数', seriename: '用户数',
+              label: "高于往期购气量",
+              value: Math.random(),
+              name: 'ti.f_user_type is not null',
+              echartsType: 'bar',
+              dateif: true,
+              namesubif: false,
+              xname: '月',
+              yname: '用户数',
+              seriename: '用户数',
               // sqlcondition: {
               //   items: '\'民用高于往期' + s1 + '%\' type,count(r) value,to_char(F_DELIVERY_DATE,\'yyyy-mm\') name,\'notparam\'  drilltype',
               //   tablename: '(SELECT (CASE when PASTSCALE>' + this.param + ' then F_USERINFO_ID end) r,F_DELIVERY_DATE ' +
@@ -407,15 +583,22 @@ export function getDrillParameter(title, idname, param1, param2) {
               //   condition: 'qq.r is not null  GROUP BY to_char(F_DELIVERY_DATE,\'yyyy-mm\')',
               //   orderitem: '1'
               // },
-              sqlcondition:'pastscaledo',
+              sqlcondition: 'pastscaledo',
               listparam: 'cast(PASTSCALE as NUMERIC) >' + this.param + ' and ',
               dateparam: "f_delivery_date",
 
             },
             //低于往期购气量
             {
-              label: "低于往期购气量", value: Math.random(),          name: 'ti.f_user_type is not null', echartsType: 'bar', dateif: true, namesubif: false,
-              xname: '月', yname: '用户数', seriename: '用户数',
+              label: "低于往期购气量",
+              value: Math.random(),
+              name: 'ti.f_user_type is not null',
+              echartsType: 'bar',
+              dateif: true,
+              namesubif: false,
+              xname: '月',
+              yname: '用户数',
+              seriename: '用户数',
               // sqlcondition: {
               //   items: '\'民用低于往期' + s2 + '%\' type,count(r) value,to_char(F_DELIVERY_DATE,\'yyyy-mm\') name,\'notparam\'  drilltype',
               //   tablename: '(SELECT (CASE when PASTSCALE<' + this.param1 + ' then F_USERINFO_ID end) r,F_DELIVERY_DATE ' +
@@ -425,7 +608,7 @@ export function getDrillParameter(title, idname, param1, param2) {
               //   condition: 'qq.r is not null  GROUP BY to_char(F_DELIVERY_DATE,\'yyyy-mm\')',
               //   orderitem: '1'
               // },
-              sqlcondition:'pastscaleup',
+              sqlcondition: 'pastscaleup',
               listparam: 'cast(PASTSCALE as NUMERIC)  <' + this.param1 + ' and ',
               dateparam: "f_delivery_date",
             }
@@ -441,13 +624,20 @@ export function getDrillParameter(title, idname, param1, param2) {
           listif: false,
           dateif: true,
           dateparam: "f_delivery_date",
-          sqlcondition:'pastscaleall',
+          sqlcondition: 'pastscaleall',
           children: [
             //子列表
             //高于往期购气量
             {
-              label: "高于往期购气量", value: Math.random(),    name: 'ti.f_user_type=\'民用\'', echartsType: 'bar', dateif: true, namesubif: false,
-              xname: '月', yname: '用户数', seriename: '用户数',
+              label: "高于往期购气量",
+              value: Math.random(),
+              name: 'ti.f_user_type=\'民用\'',
+              echartsType: 'bar',
+              dateif: true,
+              namesubif: false,
+              xname: '月',
+              yname: '用户数',
+              seriename: '用户数',
               // sqlcondition: {
               //   items: '\'民用高于往期' + s1 + '%\' type,count(r) value,to_char(F_DELIVERY_DATE,\'yyyy-mm\') name,\'notparam\'  drilltype',
               //   tablename: '(SELECT (CASE when PASTSCALE>' + this.param + ' then F_USERINFO_ID end) r,F_DELIVERY_DATE ' +
@@ -457,15 +647,22 @@ export function getDrillParameter(title, idname, param1, param2) {
               //   condition: 'qq.r is not null  GROUP BY to_char(F_DELIVERY_DATE,\'yyyy-mm\')',
               //   orderitem: '1'
               // },
-              sqlcondition:'pastscaledo',
+              sqlcondition: 'pastscaledo',
               listparam: 'cast(PASTSCALE as NUMERIC) >' + this.param + ' and ',
               dateparam: "f_delivery_date",
 
             },
             //低于往期购气量
             {
-              label: "低于往期购气量", value: Math.random(),     name: 'ti.f_user_type=\'民用\'', echartsType: 'bar', dateif: true, namesubif: false,
-              xname: '月', yname: '用户数', seriename: '用户数',
+              label: "低于往期购气量",
+              value: Math.random(),
+              name: 'ti.f_user_type=\'民用\'',
+              echartsType: 'bar',
+              dateif: true,
+              namesubif: false,
+              xname: '月',
+              yname: '用户数',
+              seriename: '用户数',
               // sqlcondition: {
               //   items: '\'民用低于往期' + s2 + '%\' type,count(r) value,to_char(F_DELIVERY_DATE,\'yyyy-mm\') name,\'notparam\'  drilltype',
               //   tablename: '(SELECT (CASE when PASTSCALE<' + this.param1 + ' then F_USERINFO_ID end) r,F_DELIVERY_DATE ' +
@@ -475,7 +672,7 @@ export function getDrillParameter(title, idname, param1, param2) {
               //   condition: 'qq.r is not null  GROUP BY to_char(F_DELIVERY_DATE,\'yyyy-mm\')',
               //   orderitem: '1'
               // },
-              sqlcondition:'pastscaleup',
+              sqlcondition: 'pastscaleup',
               listparam: 'cast(PASTSCALE as NUMERIC)  <' + this.param1 + ' and ',
               dateparam: "f_delivery_date",
             }
@@ -496,8 +693,15 @@ export function getDrillParameter(title, idname, param1, param2) {
             //子列表
             //高于往期购气量
             {
-              label: "高于往期购气量", value: Math.random(), name: 'ti.f_user_type=\'非民用\'', echartsType: 'bar', dateif: true, namesubif: false,
-              xname: '月', yname: '用户数', seriename: '用户数',
+              label: "高于往期购气量",
+              value: Math.random(),
+              name: 'ti.f_user_type=\'非民用\'',
+              echartsType: 'bar',
+              dateif: true,
+              namesubif: false,
+              xname: '月',
+              yname: '用户数',
+              seriename: '用户数',
               // sqlcondition: {
               //   items: '\'非民用高于往期' + s1 + '%\' type,count(r) value,to_char(F_DELIVERY_DATE,\'yyyy-mm\') name,\'notparam\'  drilltype',
               //   tablename: '(SELECT (CASE when PASTSCALE>' + this.param + ' then F_USERINFO_ID end) r,F_DELIVERY_DATE ' +
@@ -507,15 +711,22 @@ export function getDrillParameter(title, idname, param1, param2) {
               //   condition: 'qq.r is not null  GROUP BY to_char(F_DELIVERY_DATE,\'yyyy-mm\')',
               //   orderitem: '1'
               // },
-              sqlcondition:'pastscaledo',
+              sqlcondition: 'pastscaledo',
               listparam: 'cast(PASTSCALE as NUMERIC)  >' + this.param + ' and ',
               dateparam: "f_delivery_date",
               children: '请输入对比比例!',
             },
             //低于往期购气量
             {
-              label: "低于往期购气量", value: Math.random(),  name: 'ti.f_user_type=\'非民用\'', echartsType: 'bar', dateif: true, namesubif: false,
-              xname: '月', yname: '用户数', seriename: '用户数',
+              label: "低于往期购气量",
+              value: Math.random(),
+              name: 'ti.f_user_type=\'非民用\'',
+              echartsType: 'bar',
+              dateif: true,
+              namesubif: false,
+              xname: '月',
+              yname: '用户数',
+              seriename: '用户数',
               // sqlcondition: {
               //   items: '\'非民用低于往期' + s2 + '%\' type,count(r) value,to_char(F_DELIVERY_DATE,\'yyyy-mm\') name,\'notparam\'  drilltype',
               //   tablename: '(SELECT (CASE when PASTSCALE<' + this.param1 + ' then F_USERINFO_ID end) r,F_DELIVERY_DATE ' +
@@ -525,7 +736,7 @@ export function getDrillParameter(title, idname, param1, param2) {
               //   condition: 'qq.r is not null  GROUP BY to_char(F_DELIVERY_DATE,\'yyyy-mm\')',
               //   orderitem: '1'
               // },
-              sqlcondition:'jydpastscaleup',
+              sqlcondition: 'jydpastscaleup',
               listparam: 'cast(PASTSCALE as NUMERIC)  <' + this.param1 + ' and ',
               dateparam: "f_delivery_date",
               children: '请输入对比比例!',
@@ -540,7 +751,7 @@ export function getDrillParameter(title, idname, param1, param2) {
   //无param时，获取title配置列表
   if (param1 == '' && param2 == '') {
     var reslut = sql[title][idname]
-    console.log(reslut,'返回钻取条件')
+    console.log(reslut, '返回钻取条件')
     return reslut
   } else {
     // 有param获取title配置列表的param所在列
@@ -560,7 +771,7 @@ export function getDrillParameter(title, idname, param1, param2) {
         }
       }
     }
-    console.log(reslut,'返回钻取条件')
+    console.log(reslut, '返回钻取条件')
     return reslut
   }
 }
@@ -583,7 +794,7 @@ export function getDrillList(title, idname, param1, param2) {
       ],
       //主要用户
       mainuser: [
-       'mainuser',
+        'mainuser',
         {headData: ["客户编号", "客户名称", "客户地址", "用户类型", "用气量"]},
         {bodyData: ['f_userinfo_id', 'f_user_name', 'f_address', 'f_user_type', 'f_pregas']},
         {dateparam: "a.f_delivery_date"}
@@ -619,8 +830,8 @@ export function getDrillList(title, idname, param1, param2) {
         // },
         'longnotusegas',
         {headData: ["客户编号", "客户名称", "客户地址", "用户类型", "用气类型", "表具编号", "最近抄表时间", "未用气时长(天)"]},
-        {bodyData: ['f_userinfo_id', 'f_user_name', 'f_address', 'f_user_type', 'f_gasproperties', 'f_user_id', 'f_hand_date', 'duration']},
-        {dateparam: "al.f_hand_date"}
+        {bodyData: ['f_userinfo_id', 'f_user_name', 'f_address', 'f_user_type', 'f_gasproperties', 'f_user_id', 'f_handplan_max_handdate', 'diffday']},
+        {dateparam: "CAST(trunc(SYSDATE)- trunc(F_HANDPLAN_MAX_HANDDATE) as int)"}
       ],
       //失联
       lossassociation: [
@@ -633,9 +844,11 @@ export function getDrillList(title, idname, param1, param2) {
         //   orderitem: "\'duration desc\'"
         // },
         'lossassociation',
-        {headData: ["客户编号", "客户名称", "客户地址", "用户类型", "用气类型", "表具编号", "最近抄表时间", "失联时长(天)"]},
-        {bodyData: ['f_userinfo_id', 'f_user_name', 'f_address', 'f_user_type', 'f_gasproperties', 'f_user_id', 'f_hand_date', 'duration']},
-        {dateparam: "al.f_hand_date"}
+        {headData: ["客户编号", "客户名称", "客户地址", "用户类型", "用气类型", "表具编号", "最后上报时间", "最后表读数", "失联时长(天)"]},
+        {bodyData: ['f_userinfo_id', 'f_user_name', 'f_address', 'f_user_type', 'f_gasproperties', 'f_user_id', 'f_meteread_max_ininsertdate', 'f_meter_base', 'slday']},
+        {
+          dateparam: "slday"
+        }
       ],
       //往期对比
       pastscale: [
@@ -663,13 +876,13 @@ export function getDrillList(title, idname, param1, param2) {
           orderitem: "\'duration desc\'"
         },
         {headData: ["客户编号", "客户名称", "客户地址", "用户类型", "用气类型", "最近购气时间", "未购气时长(天)"]},
-        {bodyData: ['f_userinfo_id', 'f_user_name', 'f_address', 'f_user_type', 'f_gasproperties', 'f_delivery_date', 'duration']},
-        {dateparam: "al.f_delivery_date"}
+        {bodyData: ['f_userinfo_id', 'f_user_name', 'f_address', 'f_user_type', 'f_gasproperties', 'f_sellinggas_max_date', 'diffday']},
+        {dateparam: "CAST(trunc(SYSDATE)- NVL(F_HANDPLAN_MAX_HANDDATE,a.f_input_date) as int)"}
       ],
     },
   }
 
 
   //返回PageList查询条件
-  return [ List[title][idname][1], List[title][idname][2], List[title][idname][3]]
+  return [List[title][idname][1], List[title][idname][2], List[title][idname][3]]
 }

package/src/stores/MagGetSaleParams.js

@@ -9,14 +9,35 @@ let MagGetSaleParam = {
   prices: [],
   adjustables: [],
   inputtors : [],
+  smallareas:[],
   async initinputtor(){
     let res = await Vue.resetpost('rs/sql/getAlluserRes', {data:{
-        condition:" 1=1"
-      }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
+      condition:" 1=1"
+    }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
     if(res.data){
       MagGetSaleParam.inputtors = res.data;
     }
   },
+  async getsmallarea(filiale){
+    let smallareas=[]
+    let condition=`f_small_area is not null and f_small_area <>''  group by f_small_area`
+    if(filiale){
+      condition=`f_filialeid='${filiale}' and f_small_area is not null and f_small_area <>''  group by f_small_area`
+    }
+    let res = await Vue.resetpost('rs/sql/manage_singleTable', {data:{
+    items: 'f_small_area', tablename: 't_user_address', orderitem: 'f_small_area DESC',condition:condition
+      }}, {resolveMsg: null, rejectMsg: '获取区域出错！！！'})
+    if(res.data){
+      res.data.forEach((item) => {
+        var param={
+          label:item.f_small_area,
+          value:item.f_small_area
+        }
+        smallareas.push(param)
+      })
+    }
+    return  smallareas
+  },
   getresinputtor(orgid){
     let inputtors = []
     if(MagGetSaleParam.inputtors.length>0){
@@ -32,7 +53,6 @@ let MagGetSaleParam = {
     }
     return inputtors;
   },
-
   // 开启卡监听
   organizeData (fromSystem) {
     if(Vue.android){
@@ -100,8 +120,7 @@ let MagGetSaleParam = {
     if (object){
       // 做筛选
       MagGetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
-          object.f_gasproperties === item.f_gasproperties &&
+        if (item.f_state === '有效' &&
           item.f_price_type === object.f_price_type &&
           item.f_filialeid === object.filter) {
           let value = {
@@ -114,8 +133,7 @@ let MagGetSaleParam = {
     }else{
       // 做筛选
       MagGetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
-          object.f_gasproperties === item.f_gasproperties &&
+        if (item.f_state === '有效' &&
           item.f_price_type === object.f_price_type) {
           let value = {
             label: item.f_price_name,