sale-client 4.0.67-preview → 4.0.69-preview

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://localhost:9026/']
+const [ serverRul, localUrl ] = ['http://222.222.226.211:31467/', 'http://localhost:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -11,7 +11,7 @@ var devConfig = {
     publicPath: baseConfig.output.publicPath,
     historyApiFallback: true,
     host: '127.0.0.1',
-    port: 8089,
+    port: 8090,
     open: false,
     stats: {
       colors: false, // 配置控制台输出彩色日志
@@ -19,12 +19,6 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
-      '/api/af-revenue/sql/getAuditMachineHand': {
-        pathRewrite: {
-          '/api/af-revenue/sql/getAuditMachineHand': '/rs/sql/getAuditMachineHand'
-        },
-        target: 'http://localhost:8080/'
-      },
       '/api/af-revenue/logic': {
         // pathRewrite: {
         //   '/api/af-revenue/logic': '/logic'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.0.67-preview",
+  "version": "4.0.69-preview",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/comprehen/ToolCard/ToolCardList.vue

@@ -55,7 +55,7 @@
         try {
           let http = new HttpResetClass()
           let res = await http.load('GET', `rs/vue/toolcards.json`, {}, {resolveMsg: null, rejectMsg: null})
-          this.model.rows = res.data
+          this.model.rows = res.data.value ? res.data.value : res.data
         } catch (e) { }
       },
       search () {

package/src/filiale/huaran/ToolCardList.vue

@@ -0,0 +1,77 @@
+<template>
+  <div class="flex" :model="model">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <ul class="nav nav-tabs">
+              <li class="active"><a href="#">生产厂家</a></li>
+            </ul>
+          </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>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align:center">{{$index + 1}}</td>
+            <td style="text-align:center">{{row.name}}</td>
+          </tr>
+        </template>
+      </data-grid>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    data () {
+      return {
+        cardTools: [],
+        f_orgid: '',
+        model: {rows: []}
+      }
+    },
+    props: {
+      row: {},
+      ispartial: false,
+      f_filialeid: {
+        type: String
+      }
+    },
+    ready () {
+      this.search()
+    },
+    methods: {
+      async gettoolcards () {
+        try {
+          let http = new HttpResetClass()
+          let res = await http.load('GET', `rs/vue/toolcards.json`, {}, {resolveMsg: null, rejectMsg: null})
+          this.model.rows = res.data.value ? res.data.value : res.data
+        } catch (e) { }
+      },
+      search () {
+        this.gettoolcards()
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeid = val[0]
+      }
+    },
+    watch: {
+      'model.rows.length' (val) {
+        if (val === 1) {
+          this.$refs.grid.select(this.model.rows[0])
+        }
+      }
+    }
+  }
+</script>

package/src/filiale/huaran/sale.js

@@ -7,4 +7,6 @@ export default function () {
   Vue.component('file-meter-info-new', (resolve) => { require(['./FilesManageNew/MeterinfoTest'], resolve) })
   // 用户基本信息test
   Vue.component('file-user-essential-info-new', (resolve) => { require(['./FilesManageNew/UserEssentialInfoTest'], resolve) })
+  // 工具卡制
+  Vue.component('tool-card-list', (resolve) => { require(['./ToolCardList'], resolve) })
 }