sale-client 3.6.450 → 3.6.451

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Nov 20 11:54:44 CST 2024
+gradle.version=5.2.1

package/package.json

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

package/src/filiale/meihekou/CardHand.vue

@@ -274,12 +274,12 @@
                   <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_unused_gas"
+                      <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_unused_gas}}</span>
+                      <span>{{row.f_shengyu_gas}}</span>
                     </div>
                   </td>
 
@@ -613,7 +613,7 @@
               // || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(2) < 0
         if (row.f_tablebase) {
           row.f_actualtablebase = (row.f_tablebase - 0) - (row.f_last_tablebase - 0)
-          row.f_unused_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
+          row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
                   /* this.$resetpost('rs/logic/cardhands', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
                       console.log('返回数据', res)
                       row.id = res.data.id

package/src/filiale/meihekou/handOperate.vue

@@ -38,7 +38,7 @@
                         v-model="model.f_input_date"
                         :value.sync="model.f_input_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
-                        >
+            >
             </datepicker>
           </div>
           <div class="col-sm-4 form-group">
@@ -58,10 +58,10 @@
           </div>
         </div>
 
-          <!--<div class="col-sm-4 form-group">
-            <label class="font_normal_body">用户编号</label>
-            <input type="text" v-model="model.f_userinfo_code" disabled=disabled style="width: 60%" class="input_search">
-          </div>-->
+        <!--<div class="col-sm-4 form-group">
+          <label class="font_normal_body">用户编号</label>
+          <input type="text" v-model="model.f_userinfo_code" disabled=disabled style="width: 60%" class="input_search">
+        </div>-->
         <div class="row">
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">上期结余</label>
@@ -88,7 +88,7 @@
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="参数:是否">是否缴费</label>
-<!--            <input type="text" v-model="model.f_whether_pay"  style="width: 60%" class="input_search">-->
+            <!--            <input type="text" v-model="model.f_whether_pay"  style="width: 60%" class="input_search">-->
             <v-select :value.sync="model.f_whether_pay" v-model="model.f_whether_pay"
                       :options='writePays' placeholder='是否缴费'
                       :value-single="true"
@@ -117,18 +117,27 @@
           <div class="col-sm-4 form-group">
             <!--<label class="font_normal_body" title="参数:操作人员">操作人员</label>-->
             <!--<v-select :value.sync="model.f_operatorid"-->
-                      <!--v-model="model.f_operatorid"-->
-                      <!--:value-single="true"  @change="selectoperator()"-->
-                      <!--:options='foperator'-->
-                      <!--close-on-select></v-select>-->
+            <!--v-model="model.f_operatorid"-->
+            <!--:value-single="true"  @change="selectoperator()"-->
+            <!--:options='foperator'-->
+            <!--close-on-select></v-select>-->
             <label class="font_normal_body" title="参数:录入人员">录入人员</label>
             <v-select :value.sync="model.f_input_person"
-            v-model="model.f_input_person"
-            :value-single="true"
-            :options='person'
-            close-on-select></v-select>
+                      v-model="model.f_input_person"
+                      :value-single="true"
+                      :options='person'
+                      close-on-select></v-select>
           </div>
           <div class="row">
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body" title="开票标识">开票标识</label>
+              <v-select :value.sync="model.f_isbill" v-model="model.f_isbill"
+                        :options='isbills' placeholder='开票标识'
+                        :value-single="true"
+                        :search="false"
+                        close-on-select>
+              </v-select>
+            </div>
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">审核人</label>
               <input type="text" v-model="model.f_audit_person"  style="width: 60%" class="input_search">
@@ -167,7 +176,7 @@
         </div>
         <div class="row">
           <div class="col-sm-12">
-              <label for="f_user_type" class="font_normal_body">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+            <label for="f_user_type" class="font_normal_body">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
 
             <div class="col-sm-10" id="f_comments" style="margin-left: 8px;margin-bottom: 5px;width: 86.333333%;">
               <textarea class="col-sm-3 form-control" type="text" v-model="model.f_comments"></textarea>
@@ -197,234 +206,244 @@
   </div>
 </template>
 <script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  import * as Util from "../../components/../Util";
-  var data
-  let readyGen = async function (self) {
-    await  self.$LoadParams.loadParam(self.f_filialeid)
-    await    self.$GetSaleParam.initinputtor()
-    await self.initperson()
-  }
-  export default {
-    title: '基本信息',
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+import * as Util from "../../components/../Util";
+var data
+let readyGen = async function (self) {
+  await  self.$LoadParams.loadParam(self.f_filialeid)
+  await    self.$GetSaleParam.initinputtor()
+  await self.initperson()
+}
+export default {
+  title: '基本信息',
 
-    data () {
-      return {
-        // 构建数组来存储对象
-        editbank: true,
-        showfiles: false,
-        priceSplit: false,
-        recordList: [],
-        // foperator:[],
-        person:[],
-        // meterstate:[{label:'已抄',value:'已抄'},{label:'未抄',value:'未抄'}],
-        // handstate:[{label:'有效',value:'有效'},{label:'冲正',value:'冲正'},{label:'作废',value:'作废'},{label:'待审核',value:'待审核'}],
-        fileNameSet: {
-          'f_meter_state': '抄表状态',
-          'f_hand_state': '抄表单状态',
-          'f_meter_source': '抄表数据来源',
-          'f_accounting_date': '财务核算日期',
-          'f_inputtor': '抄表员',
-          'f_end_date': '截止日期',
-          'f_input_date': '录入时间',
-          'f_hand_date': '下发时间',
-          'f_user_name': '客户姓名',
-          'f_userinfo_code': '客户编号',
-          'f_user_address': '客户地址',
-          'f_audit_person': '审核人',
-          'f_audit_date': '审核时间',
-          'f_orgname': '所属公司',
-          'f_depname': '所属部门',
-          'f_operator':'操作人',
-          'f_operatorid':'操作人ID'
-        }
+  data () {
+    return {
+      // 构建数组来存储对象
+      editbank: true,
+      showfiles: false,
+      priceSplit: false,
+      recordList: [],
+      // foperator:[],
+      person:[],
+      // meterstate:[{label:'已抄',value:'已抄'},{label:'未抄',value:'未抄'}],
+      // handstate:[{label:'有效',value:'有效'},{label:'冲正',value:'冲正'},{label:'作废',value:'作废'},{label:'待审核',value:'待审核'}],
+      fileNameSet: {
+        'f_meter_state': '抄表状态',
+        'f_hand_state': '抄表单状态',
+        'f_meter_source': '抄表数据来源',
+        'f_accounting_date': '财务核算日期',
+        'f_inputtor': '抄表员',
+        'f_end_date': '截止日期',
+        'f_input_date': '录入时间',
+        'f_hand_date': '下发时间',
+        'f_user_name': '客户姓名',
+        'f_userinfo_code': '客户编号',
+        'f_user_address': '客户地址',
+        'f_isbill': '开票标识',
+        'f_audit_person': '审核人',
+        'f_audit_date': '审核时间',
+        'f_orgname': '所属公司',
+        'f_depname': '所属部门',
+        'f_operator':'操作人',
+        'f_operatorid':'操作人ID'
       }
+    }
+  },
+  props: {
+    oldmodel: Object,
+    model: Object
+  },
+
+  ready () {
+    /* console.log('logininfo',this.$login.r) */
+    if (this.$login.r.includes('维护银行转账信息')) {
+      this.editbank = true
+    }
+    // console.log(this.props.model)
+    this.oldmodel = JSON.parse(JSON.stringify(this.model))
+    readyGen(this)
+  },
+  created () {
+  },
+  methods: {
+    initperson () {
+      this.person = []
+      console.log("this.$login000", this.$login, this.oldmodel, this.model)
+      let arr = this.$GetSaleParam.inputtors.filter((res) => {
+        if (res.rolestr != null && res.rolestr != '') {
+          return res.f_department_id == this.model.f_depid
+        }
+      })
+      arr.forEach((res) => {
+        this.person.push({label: res.name, value: res.name})
+      })
     },
-    props: {
-      oldmodel: Object,
-      model: Object
+    // initoperator(){
+    //   this.foperator=[]
+    //   console.log("this.$login",this.$login,this.oldmodel,this.model)
+    //   let arr = this.$GetSaleParam.inputtors.filter((res) => {
+    //     if (res.rolestr != null && res.rolestr != '') {
+    //       return res.rolestr.indexOf('营业员') > -1 && res.f_department_name == this.model.f_depname
+    //     }
+    //   })
+    //   arr.forEach((res) => {
+    //     this.foperator.push({label: res.name, value: res.id})
+    //   })
+    // },
+    // selectoperator () {
+    //   let id = this.model.f_operatorid
+    //   if(!this.model.f_operatorid){
+    //     return
+    //   }
+    //   let http = new HttpResetClass()
+    //   http.load('POST', 'rs/sql/saleSingleTable',
+    //     {data:{tablename: 't_user',
+    //         condition: `id = '${id}'`}},
+    //     {resolveMsg: null, rejectMsg: null}).then((res) => {
+    //     console.log('kanak,res', res)
+    //     if(res.data.length>0){
+    //       this.model.f_input_person = res.data[0].name
+    //     }else{
+    //       this.model.f_input_person=''
+    //       this.$showAlert('人员信息未找到','warning',2000)
+    //     }
+    //     console.log('this.f_input_person', this.model.f_input_person)
+    //   })
+    // },
+    fileterprice (row) {
+      this.priceSplit = true
+      console.log('row==>', row)
     },
-
-    ready () {
-      /* console.log('logininfo',this.$login.r) */
-      if (this.$login.r.includes('维护银行转账信息')) {
-        this.editbank = true
-      }
-      // console.log(this.props.model)
-      this.oldmodel = JSON.parse(JSON.stringify(this.model))
-      readyGen(this)
+    cancel () {
+      this.$dispatch('close')
     },
-    created () {
+    uploadFiles () {
+      this.showfiles = !this.showfiles
     },
-    methods: {
-      initperson(){
-        this.person=[]
-        console.log("this.$login000",this.$login,this.oldmodel,this.model)
-        let arr = this.$GetSaleParam.inputtors.filter((res) => {
-          if (res.rolestr != null && res.rolestr != '') {
-            return res.f_department_id == this.model.f_depid
-          }
-        })
-        arr.forEach((res) => {
-          this.person.push({label: res.name,value: res.name})
-        })
-        if (this.model.f_meter_classify === '物联网表' && this.model.f_input_person === ''){
-          this.model.f_input_person = '微信公众号'
+    async getenddate () {
+      var end_date = await this.$resetpost('rs/logic/getEndDate', {
+        data: {
+          f_userinfo_id: this.model.f_userinfo_id,
+          f_input_date: this.model.f_input_date
         }
-      },
-      // initoperator(){
-      //   this.foperator=[]
-      //   console.log("this.$login",this.$login,this.oldmodel,this.model)
-      //   let arr = this.$GetSaleParam.inputtors.filter((res) => {
-      //     if (res.rolestr != null && res.rolestr != '') {
-      //       return res.rolestr.indexOf('营业员') > -1 && res.f_department_name == this.model.f_depname
-      //     }
-      //   })
-      //   arr.forEach((res) => {
-      //     this.foperator.push({label: res.name, value: res.id})
-      //   })
-      // },
-      // selectoperator () {
-      //   let id = this.model.f_operatorid
-      //   if(!this.model.f_operatorid){
-      //     return
-      //   }
-      //   let http = new HttpResetClass()
-      //   http.load('POST', 'rs/sql/saleSingleTable',
-      //     {data:{tablename: 't_user',
-      //         condition: `id = '${id}'`}},
-      //     {resolveMsg: null, rejectMsg: null}).then((res) => {
-      //     console.log('kanak,res', res)
-      //     if(res.data.length>0){
-      //       this.model.f_input_person = res.data[0].name
-      //     }else{
-      //       this.model.f_input_person=''
-      //       this.$showAlert('人员信息未找到','warning',2000)
-      //     }
-      //     console.log('this.f_input_person', this.model.f_input_person)
-      //   })
-      // },
-      fileterprice (row) {
-        this.priceSplit = true
-        console.log('row==>', row)
-      },
-      cancel () {
-        this.$dispatch('close')
-      },
-      uploadFiles () {
-        this.showfiles = !this.showfiles
-      },
-      async getenddate () {
-        var end_date = await this.$resetpost('rs/logic/getEndDate', {data: {f_userinfo_id: this.model.f_userinfo_id, f_input_date: this.model.f_input_date}},{rejectMsg: null,resolveMsg: null})
-        this.model.f_end_date = end_date.data
-      },
-      addressValid (val) {
-      },
-      async save () {
-        for (var item in this.model) {
-          if (this.model[item] instanceof Array) {
-            this.model[item] = this.model[item].length > 0 ? this.model[item][0] : ''
-          }
-          if (this.model[item] != this.oldmodel[item] && this.model[item] !='s_timestamp') {
-            var car = {
-              chinesename: this.fileNameSet[item],
-              fieldname: item,
-              tablename: 't_handplan',
-              oldvalue: this.oldmodel[item],
-              newvalue: this.model[item],
-              state: '有效',
-              modifitime: Util.toStandardTimeString(),
-              operator: this.$login.f.name,
-              hand_id: this.model.id,
-              f_operator : this.$login.f.name,
-              f_operatorid : this.$login.f.id,
-              f_orgid : this.$login.f.orgid,
-              f_orgname : this.$login.f.orgs,
-              f_depid : this.$login.f.depids,
-              f_depname : this.$login.f.deps,
-              f_audit_person : this.model.f_audit_person,
-              f_audit_date : this.model.f_audit_date
-            }
-            this.recordList.push(car)
-            // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
-            console.log(car)
-          }
+      }, {rejectMsg: null, resolveMsg: null})
+      this.model.f_end_date = end_date.data
+    },
+    addressValid (val) {
+    },
+    async save () {
+      for (var item in this.model) {
+        if (this.model[item] instanceof Array) {
+          this.model[item] = this.model[item].length > 0 ? this.model[item][0] : ''
         }
-        await this.$resetpost('rs/logic/saveHandRecord', {data: {recordlist: this.recordList, newData: this.model}})
-        if (this.model.f_meter_classify.indexOf('卡表') >= 0) {
-          this.model.f_result_state = this.model.f_hand_state
-          this.model.f_hand_date = this.model.f_input_date
-          await this.$resetpost('rs/entity/t_cardhand', this.model, {
-            resolveMsg: '修改成功',
-            rejectMsg: '未通过，修改出错!!!'
-          })
-        } else {
-          await this.$resetpost('rs/entity/t_handplan', this.model, {
-            resolveMsg: '修改成功',
-            rejectMsg: '未通过，修改出错!!!'
-          })
+        if (this.model[item] != this.oldmodel[item] && this.model[item] != 's_timestamp') {
+          var car = {
+            chinesename: this.fileNameSet[item],
+            fieldname: item,
+            tablename: 't_handplan',
+            oldvalue: this.oldmodel[item],
+            newvalue: this.model[item],
+            state: '有效',
+            modifitime: Util.toStandardTimeString(),
+            operator: this.$login.f.name,
+            hand_id: this.model.id,
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps,
+            f_audit_person: this.model.f_audit_person,
+            f_audit_date: this.model.f_audit_date
+          }
+          this.recordList.push(car)
+          // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
+          console.log(car)
         }
-        console.log('this.model', this.model)
-        this.$dispatch('close')
       }
+
+      await this.$resetpost('rs/logic/saveHandRecord', {data: {recordlist: this.recordList, newData: this.model}})
+      if (this.model.f_meter_classify.indexOf('卡表') >= 0) {
+        this.model.f_result_state = this.model.f_hand_state
+        this.model.f_hand_date = this.model.f_input_date
+        await this.$resetpost('rs/entity/t_cardhand', this.model, {
+          resolveMsg: '修改成功',
+          rejectMsg: '未通过，修改出错!!!'
+        })
+      } else {
+        await this.$resetpost('rs/entity/t_handplan', this.model, {
+          resolveMsg: '修改成功',
+          rejectMsg: '未通过，修改出错!!!'
+        })
+      }
+      console.log('this.model', this.model)
+      this.$dispatch('close')
+    }
+  },
+  computed: {
+    meterstate () {
+      return this.$appdata.getParam('抄表状态')
+    },
+    handstate () {
+      return this.$appdata.getParam('抄表单状态')
+    },
+    isbills () {
+      return this.$appdata.getParam('开票标识')
+    },
+    writePays () {
+      return this.$appdata.getParam('是否')
+    },
+    resultstate () {
+      return this.$appdata.getParam('抄表结果状态')
     },
-    computed: {
-      meterstate () {
-        return this.$appdata.getParam('抄表状态')
-      },
-      handstate () {
-        return this.$appdata.getParam('抄表单状态')
-      },
-      writePays () {
-        return this.$appdata.getParam('是否')
-      },
-      resultstate () {
-        return this.$appdata.getParam('抄表结果状态')
-      },
 
-      inputtores () {
-        // 获取抄表员
-        console.log('获取抄表员', this.$login.f)
-        let rs = new Array()
-        if (this.$login.f.f_gasman.length > 0) {
-          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
-            let temp = {
-              label: this.$login.f.f_gasman[i].name,
-              value: this.$login.f.f_gasman[i].name
-            }
-            rs.push(temp)
+    inputtores () {
+      // 获取抄表员
+      console.log('获取抄表员', this.$login.f)
+      let rs = new Array()
+      if (this.$login.f.f_gasman.length > 0) {
+        for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+          let temp = {
+            label: this.$login.f.f_gasman[i].name,
+            value: this.$login.f.f_gasman[i].name
           }
+          rs.push(temp)
         }
-        // let rs = this.$appdata.getParam('抄表员')
-        return rs
       }
+      // let rs = this.$appdata.getParam('抄表员')
+      return rs
+    }
 
-    },
-    watch: {
-      'model.f_input_date' (val) {
-        if (val) {
-          this.getenddate()
-        }
-      },
-      'model'(){
-        this.initperson()
+  },
+  watch: {
+    'model.f_input_date' (val) {
+      if (val) {
+        this.getenddate()
       }
+    },
+    'model' () {
+      this.initperson()
     }
   }
+}
 </script>
 <style lang="less" scoped>
-#meterInfoTest{
+#meterInfoTest {
   #addboxmap {
     height: 300px;
   }
+
   .glyphicon-map-marker:hover {
     color: red;
   }
+
   .glyphicon-map-marker {
     color: blue;
     cursor: pointer;
   }
+
   .col-sm-4 {
     .font_normal_body {
       width: 73px;
@@ -434,19 +453,23 @@
       &::-webkit-scrollbar-button {
         display: none;
       }
+
       // 滚动条的宽度
       &::-webkit-scrollbar {
         width: 5px !important;
         height: 5px !important;
       }
+
       // 滚动条的设置
       &::-webkit-scrollbar-thumb {
         background-color: #ddd;
         background-clip: padding-box;
       }
+
       &::-webkit-scrollbar-thumb:hover {
         background-color: #bbb;
       }
+
       &::-webkit-scrollbar-track {
         /*滚动条里面轨道*/
         box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);

package/src/filiale/meihekou/sale.js

@@ -4,6 +4,7 @@ import Vue from 'vue'
 export default function () {
   // 售气收费 --收费gas-move
   Vue.component('charge-manage', (resolve) => { require(['./ChargeManage'], resolve) })
+  Vue.component('hand-operate', (resolve) => { require(['./handOperate'], resolve) })
   Vue.component('charge-list', (resolve) => { require(['./ChargeList'], resolve)})
   Vue.component('card-hand', (resolve) => { require(['./CardHand'], resolve) })
   Vue.component('hand-manager', (resolve) => { require(['./HandManager'], resolve) })