manage-client 3.2.291 → 3.2.292-2

package/src/filiale/shanxian/Paymentpie.vue

@@ -147,9 +147,9 @@ export default {
     setMoney (arrparams, moneydata) {
       console.log('进入组件')
       let option = {
-        color: ['#894BE5', '#FFA500',
-          '#FF00A1', '#00BFFF',
-          '#00FFC8', '#FF0000',
+        color: ['#00C953', '#FFA500',
+          '#FFC0CB', '#00BFFF',
+          '#00FFC8', '#87CEEB',
           '#FFE400', '#9FDB1D',
           '#165DFF', '#00FF2A'],
         title: [

package/src/filiale/shanxian/RecordInfoQuery.vue

@@ -38,7 +38,7 @@
                     <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
 
                     <export-excel :data="$parent.$parent.getCondition"
-                                  :field="$parent.$parent.getExportField"
+                                  :field="$parent.$parent.getExportField" :defaultselect="$parent.$parent.getDefaultExportField"
                                   v-if="$parent.$parent.authArr.includes('档案查询导出')"
                                   sqlurl="rs/easyExcel/compreExport" sql-name="compreQuery" template-name='综合档案查询导出'  :choose-col="true"></export-excel>
                     <print-data :sum-field="$parent.$parent.getExportField" :model="$parent.model" :field="$parent.$parent.getExportField"
@@ -472,7 +472,7 @@
                   <th colspan="6">
                     <nobr>燃气表</nobr>
                   </th>
-                  <th colspan="62">
+                  <th colspan="63">
                     <nobr>其他</nobr>
                   </th>
                 </tr>
@@ -487,13 +487,13 @@
                     <nobr>身份证号</nobr>
                   </th>
                   <th>
-                    <nobr>详细地址</nobr>
+                    <nobr>用户地址</nobr>
                   </th>
                   <th>
                     <nobr>联系电话</nobr>
                   </th>
                   <th>
-                    <nobr>建档日期</nobr>
+                    <data-order field="f_createfile_date" name="建档日期" :order.sync="$parent.$parent.$parent.orderFields.f_createfile_date"></data-order>
                   </th>
                   <th>
                     <nobr>供气合同编号</nobr>
@@ -535,6 +535,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>
                   <th><nobr>楼层</nobr></th>
@@ -697,9 +698,10 @@
                 <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>-->
 <!--                <td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>-->
-                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.address}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_building}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_unit}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>-->
                 <td style="text-align: center;"><nobr>{{row.f_room}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>-->
@@ -1373,6 +1375,9 @@
       },
       getExportField() {
         return exportConfig.compreConfig
+      },
+      getDefaultExportField() {
+        return exportConfig.defaultCompreConfig
       }
     }
   }

package/src/filiale/shanxian/SiteManager.vue

@@ -77,7 +77,7 @@ export default {
     setNum (arrparams1, numdata1, arrparams2, numdata2, arrparams3, numdata3, color1, color2, color3) {
       console.log('进入组件')
       let option1 = {
-        color: ['#FE974B', '#3D72FF', '#00C953'],
+        color: ['#7dabbf', '#9ac57d', '#cfcbbf'],
         title: [
           {
             text: '销售气量饼状图',
@@ -139,7 +139,7 @@ export default {
     setGas (arrparams1, gasdata1, arrparams2, gasdata2, arrparams3, gasdata3, color1, color2, color3) {
       console.log('进入组件')
       let option = {
-        color: ['#FE974B', '#3D72FF', '#00C953'],
+        color: ['#7dabbf', '#9ac57d', '#cfcbbf'],
         title: [
           {
             text: '',