sale-client 3.6.237 → 3.6.238

package/build/dev-server.js

@@ -1,97 +1,97 @@
-var path = require('path')
-const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.dev.conf')
-var devConfig = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    host: '127.0.0.1',
-    port: 8089,
-    open: false,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-      '/invoice/rs/logic/getInvoice': {
-        target: serverRul
-      },
-      '/rs/file': {
-        target: serverRul
-      },
-      '/webapps': {
-        target: serverRul
-      },
-      '/rs/sql/singleTable': {
-        target: serverRul
-      },
-      '/invoice': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/search': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getLogin': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getInitData': {
-        target: serverRul
-      },
-      '/rs/logic/getSaleInitData': {
-        target: serverRul
-      },
-      // 用户登录服务地址
-      '/rs/user': {
-        target: serverRul
-      },
-      '/rs/path': {
-        target: serverRul
-      },
-      '/rs/data': {
-        target: serverRul
-      },
-      '/rs/license': {
-        target: serverRul
-      },
-      '/rs/db': {
-        target: serverRul
-      },
-      '/excel': {
-        target: serverRul
-      },
-      '/rs/config': {
-        target: serverRul
-      },
-      '/rs/report': {
-        target: serverRul
-      },
-      '/rs/vue': {
-        target: serverRul
-      },
-      '/rs/logic/webHandReverse': {
-        target: 'http://localhost:8085'
-      },
-      '/rs/logic': {
-        target: localUrl
-      },
-      '/rs/sql': {
-        target: localUrl
-      },
-      '/webmeter': {
-        target: serverRul
-      },
-      '/rs': {
-        target: serverRul
-        // changeOrigin: true
-      }
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+var path = require('path')
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080']
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.dev.conf')
+var devConfig = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    host: '127.0.0.1',
+    port: 8089,
+    open: false,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+      '/invoice/rs/logic/getInvoice': {
+        target: serverRul
+      },
+      '/rs/file': {
+        target: serverRul
+      },
+      '/webapps': {
+        target: serverRul
+      },
+      '/rs/sql/singleTable': {
+        target: serverRul
+      },
+      '/invoice': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/search': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getLogin': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getInitData': {
+        target: serverRul
+      },
+      '/rs/logic/getSaleInitData': {
+        target: serverRul
+      },
+      // 用户登录服务地址
+      '/rs/user': {
+        target: serverRul
+      },
+      '/rs/path': {
+        target: serverRul
+      },
+      '/rs/data': {
+        target: serverRul
+      },
+      '/rs/license': {
+        target: serverRul
+      },
+      '/rs/db': {
+        target: serverRul
+      },
+      '/excel': {
+        target: serverRul
+      },
+      '/rs/config': {
+        target: serverRul
+      },
+      '/rs/report': {
+        target: serverRul
+      },
+      '/rs/vue': {
+        target: serverRul
+      },
+      // '/rs/logic/webHandReverse': {
+      //   target: 'http://localhost:8085'
+      // },
+      '/rs/logic': {
+        target: localUrl
+      },
+      '/rs/sql': {
+        target: localUrl
+      },
+      '/webmeter': {
+        target: serverRul
+      },
+      '/rs': {
+        target: serverRul
+        // changeOrigin: true
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/package.json

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

package/src/components/revenue/comprehen/Bill/EticketV4/CustQueryEticket.vue

@@ -26,7 +26,7 @@
           </div>
             <div style="float: right">
               <button class="button_search"  @click="search()">查 询</button>
-              <button class="button_search"  @click="$parent.$parent.open_eTicket()">开票</button>
+              <!--<button class="button_search"  @click="$parent.$parent.open_eTicket()">开票</button>-->
               <div
                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                 @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
@@ -98,8 +98,7 @@
           <td style="text-align:center">{{row.f_type}}</td>
           <td style="text-align:center">{{row.f_operate_date}}</td>
           <td>
-            <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票
-            </button>
+            <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
           </td>
         </template>
         <template partial='foot'></template>

package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenCard.vue

@@ -50,7 +50,7 @@
               </div>
               <div style="float: right">
                 <button class="button_search" @click="search()">查 询</button>
-                <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
+                <!--<button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>-->
               </div>
             </div>
           </div>
@@ -59,10 +59,10 @@
       <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
         <template partial='head'>
           <tr>
-            <th>
-              <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)"
-                     style="width: 22px;height: 22px"    :checked="$parent.$parent.$parent.selectAll">
-            </th>
+            <!--<th>-->
+            <!--  <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)"-->
+            <!--         style="width: 22px;height: 22px"    :checked="$parent.$parent.$parent.selectAll">-->
+            <!--</th>-->
             <th>客户编号</th>
             <th>客户姓名</th>
             <th>客户地址</th>
@@ -73,14 +73,15 @@
             <th>收款部门</th>
             <th>是否开过票</th>
             <th>缴费时间</th>
+            <th>操作</th>
           </tr>
         </template>
         <template partial='body' :model="model">
           <tr>
-            <td style="text-align:center">
-              <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" :value="row"
-                     style="width: 22px;height: 22px"    @click="$parent.$parent.$parent.checkbox($index, $event)">
-            </td>
+            <!--<td style="text-align:center">-->
+            <!--  <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" :value="row"-->
+            <!--         style="width: 22px;height: 22px"    @click="$parent.$parent.$parent.checkbox($index, $event)">-->
+            <!--</td>-->
             <th style="text-align:center">{{ row.f_userinfo_code }}</th>
             <th style="text-align:center">{{ row.f_user_name }}</th>
             <th style="text-align:center">{{ row.f_address }}</th>
@@ -91,6 +92,9 @@
             <th style="text-align:center">{{ row.f_depname }}</th>
             <th style="text-align:center">{{ row.is_bill }}</th>
             <th style="text-align:center">{{ row.f_operate_date }}</th>
+            <th>
+              <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
+            </th>
           </tr>
         </template>
       </data-grid>
@@ -202,6 +206,31 @@ export default {
     search () {
       this.$refs.paged.$refs.cri.search()
     },
+    async kp (row) {
+      let HttpReset = new HttpResetClass()
+      let _row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
+        data: {
+          orderitem: 'f_userinfo_code',
+          condition: `f_userinfo_code = '${row.f_userinfo_code}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+      this.row = _row.data[0]
+      this.row.id = row.id
+      this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
+      if (!this.row.f_taxpayer_id) {
+        this.row.f_taxpayer_id = this.row.f_idnumber
+      }
+      if (!this.row.f_paper_name) {
+        this.row.f_paper_name = this.row.f_user_name
+      }
+      if (!this.row.f_address_phone) {
+        this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+      }
+      if (!this.row.f_email) {
+        this.row.f_email = this.row.f_email
+      }
+      this.eticket_msg = true
+    },
     async open_eTicket () {
       if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
         this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
@@ -214,7 +243,7 @@ export default {
         //
         //     }
         //   })
-        return this.$showAlert('已结算的记录不能再次结算开票','warning',3000)
+        return this.$showAlert('已结算的记录不能再次结算开票', 'warning', 3000)
       }
       let HttpReset = new HttpResetClass()
       let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
@@ -234,7 +263,7 @@ export default {
       if (!this.row.f_address_phone) {
         this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
       }
-      if(!this.row.f_email){
+      if (!this.row.f_email) {
         this.row.f_email = this.row.f_email
       }
       this.eticket_msg = true
@@ -242,7 +271,7 @@ export default {
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '是',this.invoice_is_pax, '结算收费')
+      this.$refs.eticketbill.openETicket(this.row.id, this.row, '结算收费')
     },
     selfSearch (args) {
       this.selecteds = []

package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenJBPage.vue

@@ -50,7 +50,7 @@
               </div>
               <div style="float: right">
                 <button class="button_search" @click="search()">查 询</button>
-                <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
+                <!--<button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>-->
               </div>
             </div>
           </div>
@@ -93,8 +93,7 @@
             <th style="text-align:center">{{ row.is_bill }}</th>
             <th style="text-align:center">{{ row.f_hand_date }}</th>
             <th>
-              <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票
-              </button>
+              <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
             </th>
           </tr>
         </template>

package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenPage.vue

@@ -50,7 +50,7 @@
               </div>
               <div style="float: right">
                 <button class="button_search" @click="search()">查 询</button>
-                <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
+                <!--<button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>-->
               </div>
             </div>
           </div>
@@ -93,8 +93,8 @@
             <th style="text-align:center">{{ row.is_bill }}</th>
             <th style="text-align:center">{{ row.f_operate_date }}</th>
             <th>
-              <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票
-            </button></th>
+              <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
+            </th>
           </tr>
         </template>
       </data-grid>