manage-client 3.2.93-aode → 3.2.94-aode

package/src/components/sale/config/exportConfig.js

@@ -251,7 +251,7 @@ export default{
     "f_userinfo_code":"客户编号","f_user_type":"客户类型","f_gasproperties":"用气性质","f_has_stove":"壁挂炉","f_has_heater":"热水器","f_user_name":"客户名称",
   "f_address":"用气地址","f_meter_brand":"气表品牌","f_hand_date":"起始~终止时间","datadiff":"用气天数","f_meternumber":"表号",
     "f_balance":"期初余额(元)","f_last_tablebase":"上期底数","f_tablebase":"本期底数","f_oughtamount":"用气量(m³)","oughtamount":"用气量(上传)",
-    "f_oughtfee":"用气金额(元)", "oughtfee":"用气金额(上传)","f_pregas":"期间购气量", "f_preamount":"期间购气金额(元)","f_curbalance":"期末结余(元)","f_remanent_gas":"总抵扣气量","f_deduction_gas":"剩余抵扣气量","f_remanent_money":"换表补气金额","f_organization_name":"组织"
+    "f_oughtfee":"用气金额(元)", "oughtfee":"用气金额(上传)","f_pregas":"期间购气量", "f_preamount":"期间购气金额(元)","f_curbalance":"期末结余(元)","f_remanent_gas":"总抵扣气量","f_deduction_gas":"剩余抵扣气量","f_deduction_type":"抵扣类型","f_remanent_money":"换表补气金额","f_organization_name":"组织"
   },
   queryUserStateFiles:{
     "f_userinfo_code":"客户编号","f_user_name":"客户姓名","f_orgname":"公司名称","f_depname":"部门名称","f_operator":"操作员","f_operate_date":"操作时间",

package/src/components/webmeter/DrillData/NewUserGasAll.vue

@@ -268,6 +268,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>
@@ -317,6 +320,7 @@
                 <td style="text-align:center">{{row.f_remanent_gas}}</td>
                 <td style="text-align:center">{{row.f_deduction_gas}}</td>
                 <td style="text-align:center">{{row.f_remanent_money}}</td>
+                <td style="text-align:center">{{row.f_deduction_type}}</td>
                 <td style="text-align:center">{{row.f_organization_name}}</td>
               </template>
               <template partial='foot'>

package/yarn-error.log

@@ -1,26 +1,25 @@
-Arguments: 
-  E:\nvm-node\node.exe E:\nvm\v14.20.0\node_global\node_modules\yarn\bin\yarn.js install
-
-PATH: 
-  C:\Program Files\Java\jdk-1.8\bin;E:\python\Scripts\;E:\python\;E:\VMware\bin\;C:\Program Files\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;node_global;D:\Git\bin;D:\Git\cmd;E:\MySQL Server 8.0\bin;C:\Program Files\Azure Data Studio\bin;E:\Microsoft VS Code\Microsoft VS Code\bin;E:\nvm;E:\nvm-node;E:\nvm\v14.20.0\node_global\node_modules\yarn\bin;C:\Program Files\OpenVPN\bin;E:\apache-maven-3.9.6\bin;E:\Xftp7\;E:\Xshell\;E:\nvm\v14.20.0\node_global;E:\nvm\v14.20.0\node_global\node_modules\@vue\cli\bin;C:\Program Files (x86)\PuTTY\;E:\Git\cmd;D:\Bandizip\;;C:\Program Files\NVIDIA Corporation\NVIDIA app\NvDLISR;C:\Users\kuhai\AppData\Local\Microsoft\WindowsApps;C:\Users\kuhai\AppData\Roaming\npm;E:\Microsoft VS Code\bin;E:\DataGrip 2023.2\bin
-
-Yarn version: 
-  1.22.19
-
-Node version: 
-  20.17.0
-
-Platform: 
-  win32 x64
-
-Trace: 
-  Error: read ECONNRESET
-      at TLSWrap.onStreamRead (node:internal/stream_base_commons:218:20)
-
-npm manifest: 
+Arguments: 
+  C:\Program Files\nodejs\node.exe C:\Program Files\nodejs\node_modules\yarn\bin\yarn.js install
+
+PATH: 
+  C:\Program Files\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;D:\work\jdk\bin;D:\work\jdk\jre\bin;D:\work\;C:\Users\k\AppData\Roaming\nvm;C:\Program Files\nodejs;D:\Bandizip;D:\soft\Bandizip;C:\Program Files\OpenVPN\bin;C:\Program Files\Git\cmd;C:\Program Files (x86)\PuTTY\;D:\tools\gradle-7.6-all\gradle-7.6\bin;C:\Program Files (x86)\NetSarang\Xshell 7\;C:\Program Files (x86)\NetSarang\Xftp 7\;C:\Users\k\AppData\Local\Microsoft\WindowsApps;C:\Users\k\AppData\Roaming\npm;C:\Users\k\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\k\AppData\Local\Programs\EmEditor;C:\Program Files\JetBrains\IntelliJ IDEA 2024.1.2\bin;D:\WorkSpace\奥德\ManageClient\node_modules\.bin
+
+Yarn version: 
+  1.22.19
+
+Node version: 
+  15.8.0
+
+Platform: 
+  win32 x64
+
+Trace: 
+  Error: EPERM: operation not permitted, copyfile 'C:\Users\k\AppData\Local\Yarn\Cache\v6\npm-got-11.8.3-integrity\node_modules\got\package.json' -> 'D:\WorkSpace\奥德\ManageClient\node_modules\got\package.json'
+
+npm manifest: 
   {
     "name": "manage-client",
-    "version": "3.2.92-aode",
+    "version": "3.2.85-aode",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {
@@ -83,7 +82,7 @@ npm manifest:
       "sinon-chai": "^2.8.0",
       "style": "0.0.3",
       "style-loader": "^0.20.3",
-      "system-clients": "3.1.109-aode",
+      "system-clients": "3.1.107-aode",
       "url-loader": "^0.5.7",
       "vue-amap": "0.5.10",
       "vue-client": "^1.22.28-aode",
@@ -118,12 +117,12 @@ npm manifest:
     ],
     "author": "liuxudong",
     "license": "ISC"
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
   # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
   # yarn lockfile v1
   
@@ -1237,13 +1236,6 @@ Lockfile:
     resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"
     integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
   
-  bindings@^1.5.0:
-    version "1.5.0"
-    resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-    integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-    dependencies:
-      file-uri-to-path "1.0.0"
-  
   blob@0.0.4:
     version "0.0.4"
     resolved "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz"
@@ -2957,11 +2949,6 @@ Lockfile:
     dependencies:
       loader-utils "~0.2.5"
   
-  file-uri-to-path@1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-    integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-  
   filename-regex@^2.0.0:
     version "2.0.1"
     resolved "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"
@@ -4841,11 +4828,6 @@ Lockfile:
     resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
     integrity sha512-EbrziT4s8cWPmzr47eYVW3wimS4HsvlnV5ri1xw1aR6JQo/OrJX5rkl32K/QQHdxeabJETtfeaROGhd8W7uBgg==
   
-  nan@^2.12.1:
-    version "2.20.0"
-    resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3"
-    integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==
-  
   nanomatch@^1.2.9:
     version "1.2.13"
     resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"
@@ -6689,10 +6671,10 @@ Lockfile:
       lower-case "^1.1.1"
       upper-case "^1.1.1"
   
-  system-clients@3.1.109-aode:
-    version "3.1.109-aode"
-    resolved "https://registry.yarnpkg.com/system-clients/-/system-clients-3.1.109-aode.tgz#753abb24df03af1161e7046bc98830d6d6d5044c"
-    integrity sha512-fwXVSuYMMvSOsHDmJztpIgd8IAhVGVZ33SOweMXn8UE/B/fk8jVEqwwNibqh0QsRLVZrrF0OFnq3EVf72xaiVw==
+  system-clients@3.1.94-aode:
+    version "3.1.94-aode"
+    resolved "https://registry.npmjs.org/system-clients/-/system-clients-3.1.94-aode.tgz"
+    integrity sha512-oPl3holpxgXrciBnW7NDQVERT8ItPIeSrj1J0mQoUjqlhktb42m+ATSXrEbUR3zsNgnxi7P0D4NH/wxVeME5NA==
     dependencies:
       base64-js "^1.3.0"
       js-base64 "^2.4.9"
@@ -7409,4 +7391,4 @@ Lockfile:
   zrender@4.3.2:
     version "4.3.2"
     resolved "http://registry.npmjs.org/zrender/-/zrender-4.3.2.tgz"
-    integrity sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==
+    integrity sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==