sale-client 3.6.202 → 3.6.203

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://127.0.0.1:8080/']
+const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

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

@@ -400,7 +400,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
     await self.$LoadParams.loadParam(self.f_filialeid)
 
     self.loadMeterBooks()
-    await self.search()
+    // await self.search()
   }
   let modifyGen = function* (self, row, url) {
     console.log('抄表修正，。。。', row, url)

package/src/components/revenue/changeInsurance/InsuranceChargesDetails.vue

@@ -377,7 +377,7 @@
       },
       selfSearch (args) {
         if (!this.orgCondtionStr) {
-          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+          args.condition = `${args.condition}` + ' and f_orgid = ' + `${this.$login.f.orgid}`
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }

package/src/components/revenue/comprehen/Maintenance/revenue/StockListmain.vue

@@ -73,6 +73,16 @@
                             close-on-select
                             condition="f_user_type = '{}'"></v-select>
                 </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">是否开票</label>
+                  <v-select :value.sync="model.f_has_bill" v-model="model.f_has_bill"
+                            :options='$parent.$parent.hasBill' placeholder='是否开票'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_has_bill = '{}'"></v-select>
+                </div>
                 <div
                   :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
                   class="form-group">
@@ -114,6 +124,7 @@
                 <th><nobr>气量用途</nobr></th>
                 <th><nobr>用气金额</nobr></th>
                 <th><nobr>收费金额</nobr></th>
+                <th><nobr>是否开票</nobr></th>
                 <th><nobr>操作员</nobr></th>
                 <th><nobr>所属部门</nobr></th>
                 <th><nobr>所属公司</nobr></th>
@@ -139,6 +150,7 @@
               <td style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_preamount}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_collection}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_has_bill}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_depname}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
@@ -187,6 +199,7 @@ const myMap = new Map()
     data () {
       return {
         usertypes: this.$appdata.getParam('客户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户类型')] : [],
+        hasBill: this.$appdata.getParam('是否开票') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('是否开票')] : [],
         pj: this.$appdata.getParam('是否有附件') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('是否有附件')] : [],
         model: new PagedList('rs/sql/singlling', 20, {orderitem: '"f_operate_date DESC"'}),
         // model: new PagedList('rs/sql/singleTable_OrderBy', 20, {items: '"s.*,ui.f_userinfo_code"', tablename: '"t_sellinggas s left join t_userinfo ui on s.f_userinfo_id=ui.f_userinfo_id"', orderitem: '"f_delivery_date"'}),

package/src/components/revenue/comprehen/insurance/insuranceGuanL.vue

@@ -203,7 +203,7 @@
               :value-single="true"
               v-model="base.f_state"
               :options='insurancestate'
-              close-on-select disabled="base.f_state === '有效'">
+              close-on-select :disabled="stataDisabled">
             </v-select>
           </div>
           </div>
@@ -258,6 +258,7 @@
         model: new PagedList('rs/sql/insuranceguanl', 20),
         show: false,
         orgCondtionStr:'',
+        stataDisabled: false,
         criteriaShow: false,
         // 公司下拉
         curorgid: [this.$login.f.orgid]
@@ -303,9 +304,24 @@
       search () {
         this.selfSearch()
       },
+      async stateIsDisabled () {
+        let data = {
+          tablename: 't_userfees',
+          condition: `f_state = '有效' and f_userinfo_id = '${this.base.f_userinfo_id}' and id > ${this.base.id}`
+        }
+        let res = await this.$resetpost('rs/sql/saleSingleTable', {data: data}, {
+          resolveMsg: '',
+          rejectMsg: ''
+        })
+        if (res.data.length > 0) {
+          this.stataDisabled = true
+        } else {
+          this.stataDisabled = false
+        }
+      },
       selfSearch (args) {
         if (!this.orgCondtionStr) {
-          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+          args.condition = `${args.condition}` + ' and f_orgid = ' + `${this.$login.f.orgid}`
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
@@ -314,6 +330,7 @@
       updatetime (row) {
         this.base = row
         this.show = !this.show
+        this.stateIsDisabled()
       }
     }
   }

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -639,13 +639,10 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log('-----------val2:', val)
         this.imgfilename = `rs/image/file/` + val
-        console.log('-----------imgfilename2:', this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
-        console.log('开始获取小区')
         let HttpReset = new HttpResetClass()
         var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
           data: {
@@ -656,7 +653,6 @@
         let house = []
         house.push()
         for (let row of data.data) {
-          console.log('开始保存小区')
           house.push({label: row.f_residential_area, value: row.f_residential_area})
         }
         this.residentialArea = house
@@ -682,7 +678,6 @@
           str = str.replace(/"/g, `'`)
           str = str.replace(/\[/g, ``)
           str = str.replace(/\]/g, ``)
-          console.log('=====抄表员model22222222222绑定====', str)
           // 查询多个抄表员时条件
           args.condition += ` and f_inputtor in  ( ${str} )`
         }

package/src/filiale/shanxian/components/revenue/insuranceGuanL.vue

@@ -293,7 +293,7 @@
       },
       selfSearch (args) {
         if (!this.orgCondtionStr) {
-          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+          args.condition = `${args.condition}` + ' and f_orgid = ' + `${this.$login.f.orgid}`
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }

package/src/filiale/shexian/Upload.vue

@@ -41,7 +41,7 @@
               <p>
                 <a v-if="row.f_filetype.toLowerCase()==='jpg'||row.f_filetype.toLowerCase()==='png'||row.f_filetype.toLowerCase()==='gif'||row.f_filetype.toLowerCase()==='bmp'" :href="row.f_downloadURL" style="background:#6aa6e2" class="btn btn-primary" target="_blank" role="button">预览</a>
                 <button class="button_search btn-gn" v-if="row.f_filetype.toLowerCase()==='pdf'||row.f_filetype.toLowerCase()==='xls'||row.f_filetype.toLowerCase()==='xlsx'||row.f_filetype.toLowerCase()==='doc'||row.f_filetype.toLowerCase()==='docx'"  @click="downloadfile(row.f_downloadURL)" >下载</button>
-                <a v-if="isDelete == '1'" @click="delet($index,row)" href="#" class="btn btn-default" role="button">删除</a>
+                <a v-if="delimg === true ? isDelete == '1' : true" @click="delet($index,row)" href="#" class="btn btn-default" role="button">删除</a>
               </p>
             </div>
           </div>
@@ -71,10 +71,11 @@ import { HttpResetClass } from 'vue-client'
 
   export default {
     title: "附件",
-    props: ['blodid','businessid','isremark', 'isusetype','takeimg','defname','isupload','fusetype','cols','width','height'],
+    props: ['blodid','businessid','isremark', 'isusetype','takeimg','defname','isupload','fusetype','cols','width','height','deleteimg'],
     data() {
       return {
         isDelete: '0', // 删除按钮，可以进行控制（权限等）
+        delimg: true, // 删除按钮，可以进行控制（权限等）
         fileInfoData: [], // 数据库存储的文件记录对象数组
         headers: {'username': this.$login.f.name, 'blodid': '','businessid':'', 'fremarks': '','defname':'','fusetype':this.fusetype?this.fusetype:''}, // 调用rs/file/uploadFile 的参数
         showUpload: false, // 上传模态框控制
@@ -233,6 +234,9 @@ import { HttpResetClass } from 'vue-client'
         // 有删除权限
         this.isDelete = '1'
       }
+      if (this.deleteimg) {
+        this.delimg = false
+      }
       this.headers.blodid = this.blodid
       this.headers.businessid = this.businessid
       console.log('123222', this.businessid)

package/src/filiale/shexian/revenue/newchangemeter/ChangeMeter.vue

@@ -326,7 +326,7 @@
       </footer>
     </modal>
   </div>
-  <upload  v-if="config.showupload" :blodid="row.f_userinfo_id" :businessid="model.randomBusinessId" isremark="true" fusetype="换表&清零"></upload>
+  <upload  v-if="config.showupload" :blodid="row.f_userinfo_id" :businessid="model.randomBusinessId" isremark="true" :deleteimg="true" fusetype="换表&清零"></upload>
 </template>
 <script>
 /**

package/src/filiale/yuncheng/ChargeList.vue

@@ -610,6 +610,8 @@ let cardBtnGen = async function (self, val) {
     await self.clear()
     if (!self.authArr.includes('读卡限定')) {
       self.search()
+    } else {
+      self.isPager = false
     }
   }
 

package/src/filiale/yuncheng/machineHandAudit.vue

@@ -409,7 +409,7 @@
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
   import Vue from 'vue'
-  import * as Util from '../../../Util'
+  import * as Util from '../../Util'
 
   let readyGen = async function (self) {
     self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]