manage-client 3.2.2 → 3.2.6

package/src/filiale/tongchuan/config/exportConfig.js

@@ -70,7 +70,7 @@ export default{
     'f_delaypay': '滞纳金','f_comments': '备注','f_operator': '操作员','f_depname': '部门','f_orgname': '公司',
     'f_yucun': '预存金额','f_card_id': '卡号','f_stairamount1':"一阶气量",'f_stair1price':"一阶单价",'f_stair1fee':"一阶气费",
     'f_stair2amount': "二阶气量",'f_stair2price': "二阶单价",'f_stair2fee':"二阶气费",
-    'f_stair3amount':"三阶气量",'f_stair3price': "三阶单价",'f_stair3fee':"三阶气费",'f_inputtor':"抄表员"
+    'f_stair3amount':"三阶气量",'f_stair3price': "三阶单价",'f_stair3fee':"三阶气费",'f_inputtor':"抄表员",'f_serial_id':'流水号'
   },
   pricetypeGasConfig: {
     'f_price': '价格类型', 'f_gas': '当日售气量', 'f_money': '当日售气金额'

package/src/main.js

@@ -43,16 +43,16 @@ all()
 // sale()
 ldap()
 system(false)
-saleManage("WEINAN")
+saleManage()
 
-webmeterManage("WEINAN")
+webmeterManage()
 ManageHome()
-// newmanage()
-// reportManage()
+newmanage()
+reportManage()
 require('system-clients/src/styles/less/bootstrap.less')
 require('./components/qinhua/Style/qinhuaStyle.less')
 // require('./bootstrap/less/manageStyle/manageChile.less')
-// // require('./bootstrap/less/manageStyle/safeStyle.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
 
 //大屏展示要放开的样式
 // require('system-clients/src/styles/less/manageStyle/manageChile.less')

package/src/reportManage.js

@@ -468,6 +468,10 @@ export default function (filiale) {
   Vue.component('sell-check-two', (resolve) => {
     require(['./components/SellReport/OperatorCheckoutTwo'], resolve)
   })
+  // 自助结账报表
+  Vue.component('sell-BySelf-Help', (resolve) => {
+    require(['./components/SellReport/SellBySelfHelp'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale

package/src/.idea/misc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/src/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/src.iml" filepath="$PROJECT_DIR$/.idea/src.iml" />
-    </modules>
-  </component>
-</project>

package/src/.idea/src.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/src/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

package/src/.idea/workspace.xml

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="BranchesTreeState">
-    <expand>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-    </expand>
-    <select />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="2087ff6c-d9e6-466c-b193-f0d5d2482d6c" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/../build/dev-server.js" beforeDir="false" afterPath="$PROJECT_DIR$/../build/dev-server.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/main.js" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="ProjectId" id="1sTJyFXFMzYrD44cO32T0JVBAbk" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="2087ff6c-d9e6-466c-b193-f0d5d2482d6c" name="Default Changelist" comment="" />
-      <created>1620890898982</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1620890898982</updated>
-      <workItem from="1620890900685" duration="47000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="2" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="text">
-                    <value>
-                      <list>
-                        <option value="流水查询" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="468" y="125" width="600" height="584" key="find.popup" timestamp="1620890946519">
-      <screen x="0" y="0" width="1536" height="834" />
-    </state>
-    <state x="468" y="125" width="600" height="584" key="find.popup/0.0.1536.834@0.0.1536.834" timestamp="1620890946519" />
-  </component>
-</project>