manage-client 4.0.49 → 4.0.50

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Nov 04 18:30:03 CST 2024
+gradle.version=8.5

package/package.json

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

package/src/filiale/WEINAN/ReportDataQuery.vue

@@ -205,6 +205,8 @@
 
     },
     ready() {
+      this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
       this.$refs.paged.$refs.cri.search()
       readySomething(this).then(() => {
         this.$emit('ready')

package/src/filiale/xinjiangdexin/UserGasAll.vue

@@ -208,6 +208,15 @@
                               condition="f_stair = '{}'"
                               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_price_name"
+                              v-model="model.f_price_name"
+                              multiple
+                              :options="$parent.$parent.pricenames"
+                              condition="f_price_name in {}"
+                    ></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -223,6 +232,9 @@
                   <th style="text-align:center">
                     <nobr>用气性质</nobr>
                   </th>
+                  <th style="text-align:center">
+                    <nobr>气价名称</nobr>
+                  </th>
                   <th style="text-align:center">
                     <nobr>用户电话</nobr>
                   </th>
@@ -306,6 +318,7 @@
                 <td>{{row.f_userinfo_code}}</td>
                 <td style="text-align:center">{{row.f_user_type}}</td>
                 <td style="text-align:center">{{row.f_gasproperties}}</td>
+                <td style="text-align:center">{{row.f_price_name}}</td>
                 <td style="text-align:center">{{row.f_user_phone}}</td>
                 <!--<td style="text-align:center">{{row.f_gasproperties2}}</td>-->
                 <td style="text-align:center">
@@ -392,6 +405,7 @@ let readyGen = async function (self) {
   await self.$MagLoadParams.loadParam()
   self.initParams()
   self.getaddress()
+  self.getPricenames()
 }
 
 export default {
@@ -419,6 +433,7 @@ export default {
         {label: '周', value: 'week'}
       ],
       meterbrands: [],
+      pricenames: [],
       residentialArea: [],
       criteriaShow: false,
       reportStr: null,
@@ -443,6 +458,7 @@ export default {
           'f_userinfo_code':'客户编号',
           'f_user_type':'客户类型',
           'f_gasproperties': '用气性质',
+          'f_price_name': '气价名称',
           'f_user_name': '客户名称',
           'f_user_phone':'客户电话',
           'f_residential_area': '小区',
@@ -488,6 +504,17 @@ export default {
     this.getfield = this.config.excelHeaders
   },
   methods: {
+    getPricenames() {
+      this.pricenames = []
+      let priceArr = []
+      this.$MagGetSaleParam.prices.forEach((item) => {
+        let temp = {}
+        temp.label = item.f_price_name
+        temp.value = item.f_price_name
+        priceArr.push(temp)
+      })
+      this.pricenames = [{label: '全部', value: ''}, ...priceArr]
+    },
     // 查询开关
     hidden() {
       this.criteriaShow = !this.criteriaShow