manage-client 3.2.1 → 3.2.2

package/build/dev-server.js

@@ -11,17 +11,25 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan='http://119.146.1.106:8300/'
+//韶关
+// var fuwu='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8084/', fuwu_login = 'http://192.168.50.4:8400'
-var fuwu = 'http://61.134.55.234:8600'
-var system = 'http://192.168.50.4:8400'
+var bendi = 'http://127.0.0.1:8083/'
+var fuwu_login = 'http://192.168.50.4:8400'
+//公司
+// var fuwu='http://192.168.50.4:8400/'
+var fuwu='http://172.168.1.11:9001/'
+//经纬
+// var fuwu='http://60.222.250.39:8300/'
 //192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
 var proxyTable = {
   '/rs/logic/exportfile': {
-    target: fuwu
+    target: bendi
+  },
+  '/rs/entity':{
+    target:'http://127.0.0.1:8080'
   },
   '/files': {
     target: fuwu
@@ -67,7 +75,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/report': {
-    target: fuwu
+    target: bendi
   },
   '/rs/vue': {
     target: fuwu
@@ -78,8 +86,15 @@ var proxyTable = {
   '/rs/logic/SumSettleFileImport': {
     target: 'http://127.0.0.1:8080'
   },
+  '/rs/logic/getBatchOperaPro':{
+    target:  'http://127.0.0.1:8080'
+  },
+  '/rs/logic/machineChargePay':{
+    target:  'http://127.0.0.1:8080'
+  },
   '/rs': {
-    target: bendi
+    // target: 'http://127.0.0.1:8079'
+    target: fuwu
   }
 }
 

package/package.json

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

package/src/.idea/misc.xml

@@ -0,0 +1,9 @@
+<?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

@@ -0,0 +1,8 @@
+<?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

@@ -0,0 +1,9 @@
+<?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

@@ -0,0 +1,6 @@
+<?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

@@ -0,0 +1,93 @@
+<?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>

package/src/components/sale/businessquery/SalesGasClassification.vue

@@ -1,168 +1,168 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
-      <div class="flex" >
-
-        <criteria-paged :model="model" v-ref:paged>
-          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-              <div class="row">
-                <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body" >开始日期</label>
-                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              >
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body" >结束日期</label>
-                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                             >
-                  </datepicker>
-                </div>
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" @click="search()">查询</button>
-                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-
-<!--                  <export-excel :data="$parent.$parent.getCondition"-->
-<!--                                :field="$parent.$parent.getfield"-->
-<!--                                :header="$parent.$parent.other"-->
-<!--                                sqlurl="rs/logic/exportfile" sql-name="salesgasclassification" template-name='销售量分类'-->
-<!--                                :choose-col="true"></export-excel>-->
-<!--                  &lt;!&ndash;                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>&ndash;&gt;-->
-<!--                </div>-->
-              </div>
-            </div>
-            </div>
-          </criteria>
-
-          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
-            <template partial='head'>
-              <tr>
-                <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>
-                <th>
-                  <nobr>本年售气量</nobr>
-                </th>
-                <th>
-                  <nobr>本月售气金额</nobr>
-                </th>
-                <th>
-                  <nobr>本年售气金额</nobr>
-                </th>
-              </tr>
-            </template>
-            <template partial='body'>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gasproperties}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_residential_area}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_usertype}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.yuekaihu}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.niankaihu}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.kgleij}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_yuepregas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_yuepreamount}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_pregas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_preamount}}</nobr>
-              </td>
-            </template>
-            <template partial='foot'></template>
-          </data-grid>
-        </criteria-paged>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-  import defaultPrint from '../config/DefaultPrint'
-  import exportConfig from '../config/exportConfig'
-  let readySomething = async function (self) {
-
-    console.log("self.login",self.$login)
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
-    self.search()
-  }
-  export default {
-    title: '销售量分类',
-    data() {
-      return {
-        model: new PagedList('rs/sql/salesgasclassification', 20, {f_start_date: 'this.model.startDate', f_end_date: 'this.model.endDate'}),
-        orgCondtionStr: '',
-      }
-    },
-    ready() {
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
-      })
-    },
-    methods: {
-      search(){
-        this.$refs.paged.$refs.cri.search()
-      },
-      selfSearch(args) {
-        debugger
-        args.condition = `${args.condition}` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
-      }
-    },
-    watch: {
-    },
-    computed: {
-      // getCondition() {
-      //   return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
-      // },
-      // getfield() {
-      //   return exportConfig.exemptquery
-      // },
-    }
-  }
-</script>
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" >
+
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body" >开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body" >结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                             >
+                  </datepicker>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+<!--                  <export-excel :data="$parent.$parent.getCondition"-->
+<!--                                :field="$parent.$parent.getfield"-->
+<!--                                :header="$parent.$parent.other"-->
+<!--                                sqlurl="rs/logic/exportfile" sql-name="salesgasclassification" template-name='销售量分类'-->
+<!--                                :choose-col="true"></export-excel>-->
+<!--                  &lt;!&ndash;                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>&ndash;&gt;-->
+<!--                </div>-->
+              </div>
+            </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <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>
+                <th>
+                  <nobr>本年售气量</nobr>
+                </th>
+                <th>
+                  <nobr>本月售气金额</nobr>
+                </th>
+                <th>
+                  <nobr>本年售气金额</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_usertype}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.yuekaihu}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.niankaihu}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.kgleij}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_yuepregas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_yuepreamount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_pregas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_preamount}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+  let readySomething = async function (self) {
+
+    console.log("self.login",self.$login)
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    self.search()
+  }
+  export default {
+    title: '销售量分类',
+    data() {
+      return {
+        model: new PagedList('rs/sql/salesgasclassification', 20, {f_start_date: 'this.model.startDate', f_end_date: 'this.model.endDate'}),
+        orgCondtionStr: '',
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch(args) {
+        debugger
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      }
+    },
+    watch: {
+    },
+    computed: {
+      // getCondition() {
+      //   return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      // },
+      // getfield() {
+      //   return exportConfig.exemptquery
+      // },
+    }
+  }
+</script>