sale-client 3.6.212 → 3.6.213

package/build/dev-server.js

@@ -10,7 +10,7 @@ var devConfig = {
     historyApiFallback: true,
     host: '127.0.0.1',
     port: 8089,
-    open: false,
+    open: true,
     stats: {
       colors: false, // 配置控制台输出彩色日志
       chunks: false, // 不输出构建 chunk 信息

package/package.json

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

package/src/components/revenue/HandManager/CardHand.vue

@@ -334,7 +334,21 @@
 
 
             <td style="text-align: center;">{{row.f_actualtablebase}}</td>
-            <td style="text-align: center;">{{row.f_total_gas-(row.f_tablebase-row.f_initial_base)}}</td>
+            <td style="text-align: center;">
+              <div class="form-group" style="margin-bottom:0px;"
+                   v-if="row.f_meter_state === '未抄表' && $parent.$parent.$parent.shengyu == 'false'">
+                <input type="text" class="form-control" v-model="row.f_shengyu_gas"
+                       v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
+                       :disabled="row.state === '开始'"
+                >
+              </div>
+              <div v-if="row.f_meter_state !== '未抄表' && $parent.$parent.$parent.shengyu == 'false'">
+                <span >{{row.f_shengyu_gas}}</span>
+              </div>
+              <div v-if="row.f_meter_state !== '未抄表' && $parent.$parent.$parent.shengyu == 'true'">
+                <span >{{row.f_total_gas-(row.f_tablebase-row.f_initial_base)}}</span>
+              </div>
+            </td>
             <td style="text-align: center;">{{row.f_meter_state}}</td>
             <td style="text-align: center;">
 
@@ -465,6 +479,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
           dep: [],
           user: []
         },
+        shengyu: this.$appdata.getSingleValue('在线抄表计算剩余气量') ? this.$appdata.getSingleValue('在线抄表计算剩余气量') : 'true',
         orgCondtionStr: ''
       }
     },
@@ -614,7 +629,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
           console.log('================================判断前:', row.f_hand_date)
           row.f_user_id = row.f_user_id + ''
           // 余气量=累购-(本期指数-表初始指数)
-          row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
+          if (this.shengyu == 'true') {
+            console.log('走的这里。。。。。。')
+            row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
+          }
           console.log('录入完毕。。', row)
           this.$resetpost('rs/logic/cardhands', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
             console.log('返回数据', res)

package/src/components/revenue/cardHandManage/cardsHand.vue

@@ -263,6 +263,9 @@
               <th>
                 <nobr>附件查看</nobr>
               </th>
+              <th>
+                <nobr>签章图片</nobr>
+              </th>
               <th>
                 <nobr>实际用量</nobr>
               </th>
@@ -351,9 +354,24 @@
               <img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="100" :height="100"></img-self>
               <img-self :src="`rs/image/file/${row.f_notified_path}`" v-if="row.f_notified_path" :width="100" :height="100"></img-self>
             </td>
+            <td style="text-align:center">
+              <img-self :src="row.f_sign_path" v-if="row.f_sign_path.indexOf('http:') > -1" :width="100" :height="100"></img-self>
+              <img-self :src="`rs/image/file/${row.f_sign_path}`" v-else :width="100" :height="100"></img-self>
+            </td>
 
             <td style="text-align: center;">{{ row.f_actualtablebase }}</td>
-            <td style="text-align: center;">{{ row.f_shengyu_gas }}</td>
+            <td style="text-align: center;">
+              <div class="form-group" style="margin-bottom:0px;"
+                   v-if="row.f_meter_state === '未抄表' ">
+                <input type="text" class="form-control" v-model="row.f_shengyu_gas"
+                       v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
+                       :disabled="row.state === '开始'"
+                >
+              </div>
+              <div v-else>
+                <span >{{ row.f_shengyu_gas }}</span>
+              </div>
+            </td>
             <td style="text-align: center;">{{ row.f_meter_state }}</td>
             <td style="text-align: center;">
 
@@ -483,6 +501,8 @@ export default {
         'f_last_tablebase': '上期底数',
         'f_tablebase': '本期底数',
         'f_actualtablebase': '实际用量',
+        'f_img_path': '附件查看',
+        'f_sign_img': '签章图片',
         'f_meter_state': '状态'
       },
       meterbrands: [{label: '全部', value: ''}],
@@ -642,7 +662,6 @@ export default {
         row.f_total_gas = row.total_gas
         row.f_total_fee = row.total_fee
         // 余气量=累购-(本期指数-表初始指数)
-        row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(3)
         console.log('录入完毕。。', row)
         this.$resetpost('rs/logic/cardCommonEnter', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
           console.log('返回数据', res)

package/src/filiale/qianneng/ChangeMeter.vue

@@ -240,10 +240,11 @@
         </div>
         <div  class="col-sm-4 form-group" :class="[$v.f_newaroundmeter.required ? 'has-error' : '']">
           <label  class="font_normal_body">新表表向</label>
+          <input type="text" v-show="false" v-model="$refs.f_newaroundmeter.selectedItems" v-validate:f_newaroundmeter='{required: true }'>
           <v-select :value.sync="model.f_newaroundmeter" :options='aroundmeters' placeholder='新表表向'
                     :value-single="true"
                     close-on-select
-                    v-model='model.f_newaroundmeter'></v-select>
+                    v-model='model.f_newaroundmeter' v-ref:f_newaroundmeter></v-select>
         </div>
       </div>
       <div class="row auto" >
@@ -439,6 +440,9 @@ export default {
     }
   },
   computed: {
+    aroundmeters () {
+      return this.$appdata.getParam('左右表')
+    },
     flowmeterbrands () {
       let gasbrand = this.$GetSaleParam.getGasbrand()
       let flowmeterbrands = []

package/src/filiale/yuncheng/machineHandAudit.vue

@@ -40,7 +40,7 @@
                 <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
                 <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                 <export-excel
-                  :data="{condition: $parent.$parent.excelCondition}"
+                  :data="{condition: $parent.$parent.excelCondition,orderitem: $parent.$parent.orderDefault}"
                   :field="$parent.$parent.fields"
                   sqlurl="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="getAuditMachineHand"
                   template-name='抄表审核导出'
@@ -463,6 +463,7 @@
           'f_hand_date': '下发日期',
           'f_input_date': '抄表录入日期',
           'f_book_name': '抄表册',
+          'f_meter_book_sort': '表册顺序',
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
@@ -650,6 +651,7 @@
           this.model.paramSource.orderitem = `'${this.orderDefault}'`
         } else {
           this.model.paramSource.orderitem = `'${field} ${rule}'`
+          this.orderDefault = `${field} ${rule}`
         }
         this.search()
       },

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/tongchuan/sale'
+import FilialeSale from './filiale/wenxi/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'