sale-client 4.0.38-preview → 4.0.40-preview

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://localhost:9026/']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://localhost:8080', 'http://localhost:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/revenue/base/rightview/RecordCancel.vue

@@ -78,21 +78,21 @@
     }
 
     // 看看要不要给发票冲掉
-    const getEticket = await self.$resetpost('api/af-revenue/logic/singleTable', {
-      data: {
-        tablename: 't_ticketrelated',
-        condition: `f_sell_id = '${res.data.record}' and f_business_type = '${res.data.type}' and f_related_state = '有效'`
-      }
-    }, {resolveMsg: null, rejectMsg: '获取发票信息失败!!'})
-    console.log('获取发票信息', getEticket)
-
-    if (getEticket.length > 0) {
-      const params = {
-        eticket_id: getEticket[0].f_eticket_id,
-        f_invoice_type: 1
-      }
-      await self.$resetpost('invoice/rs/logic/getInvoice', {data: params}, {resolveMsg: null, rejectMsg: '发票冲红失败！！！'})
-    }
+    // const getEticket = await self.$resetpost('api/af-revenue/sql/singleTable', {
+    //   data: {
+    //     tablename: 't_ticketrelated',
+    //     condition: `f_sell_id = '${res.data.record}' and f_business_type = '${res.data.type}' and f_related_state = '有效'`
+    //   }
+    // }, {resolveMsg: null, rejectMsg: '获取发票信息失败!!'})
+    // console.log('获取发票信息', getEticket)
+    //
+    // if (getEticket.length > 0) {
+    //   const params = {
+    //     eticket_id: getEticket[0].f_eticket_id,
+    //     f_invoice_type: 1
+    //   }
+    //   await self.$resetpost('invoice/rs/logic/getInvoice', {data: params}, {resolveMsg: null, rejectMsg: '发票冲红失败！！！'})
+    // }
     console.log('准备刷新了！。。', res, self.model)
     self.$dispatch('cancel-success')
 

package/src/filiale/fugou/FileUserFiles.vue

@@ -449,6 +449,12 @@
                   <th>
                     <nobr>发卡状态</nobr>
                   </th>
+                  <th>
+                    <nobr>调压箱编号</nobr>
+                  </th>
+                  <th>
+                    <nobr>调压箱名称</nobr>
+                  </th>
                   <th v-if="!$parent.$parent.$parent.createFile">
                     <nobr>用气点名称</nobr>
                   </th>
@@ -496,6 +502,8 @@
                 <td style="text-align: center;">{{row.f_network_valve}}</td>
                 <td style="text-align: center;">{{row.f_valvestate}}</td>
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
+                <td style="text-align: center;">{{row.f_adjustable_id}}</td>
+                <td style="text-align: center;">{{row.f_adjustable_name}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_user_state}}</td>
                 <td style="text-align: center;" >{{row.f_comments}}</td>

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/fugou/sale'
+import FilialeSale from './filiale/beifangshiye/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'