manage-client 3.3.111 → 3.3.112-xinkang

package/build/dev-server.js

@@ -19,91 +19,82 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var server = 'http://192.168.50.4:8400'
+var bendi = 'http://192.168.50.67:31785'
 // var bendi = 'http://119.187.112.234:8400/'
-var local = 'http://127.0.0.1:8084'
+var wode = 'http://192.168.50.67:31785'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
 var proxyTable = {
   '/rs/logic/exportfile': {
-    target: server
+    target: bendi
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
-    target: local
+    target: 'http://localhost:8084/'
   },
   '/rs/logic/chargeQuery_by_gasproperties_line': {
-    target: local
+    target: 'http://localhost:8084/'
   },
   '/files': {
-    target: server
+    target: bendi
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: server
+    target: bendi
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
-    target: server
+    target: bendi
   },
   // 查找资源服务数据
   '/rs/logic/getInitData': {
-    target: server
+    target: bendi
   },
   '/rs/logic/getSaleInitData': {
-    target: server
+    target: bendi
   },
   // 用户登录服务地址
   '/rs/user': {
-    target: server
+    target: bendi
   },
   '/rs/path/getParams': {
-    target: server
+    target: bendi
   },
   '/rs/data': {
-    target: server
+    target: bendi
   },
   '/rs/license': {
-    target: server
+    target: bendi
   },
   '/rs/db': {
-    target: server
+    target: bendi
   },
   '/excel': {
-    target: server
+    target: bendi
   },
   '/rs/config': {
-    target: server
+    target: bendi
   },
   '/rs/sql/getLicenseById': {
-    target: server
+    target: bendi
   },
   '/rs/report': {
-    target: server
+    target: bendi
   },
   '/rs/vue': {
-    target: server
+    target: bendi
   },
   '/rs/file': {
-    target: local
+    target: bendi
   },
   '/rs/sql/singleTable': {
-    target: server
-  },
-  '/rs/sql/address': {
-    target: server
-  },
-  '/rs/sql/getFiles': {
-    target: server
+    target: bendi
   },
   '/rs/sql': {
-    target: local
-  },
-  '/rs/logic': {
-    target: local
+    target: 'http://localhost:8084/'
   },
   '/rs': {
-    target: server
+    target: wode
   }
 }
 

package/lib/package_2022-12-01-14-30-50.json

@@ -0,0 +1,109 @@
+{
+  "name": "manage-client",
+  "version": "3.2.174",
+  "description": "经营管控模块前台组件",
+  "main": "src/index.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {
+    "swiper": "^5.4.5"
+  },
+  "devDependencies": {
+    "axios": "0.15.3",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "filemanager-webpack-plugin": "^2.0.5",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "3.0.28",
+    "less": "^2.7.3",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.0",
+    "sale-client": "3.4.14",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "swiper": "^5.4.5",
+    "system-clients": "3.1.89-20",
+    "url-loader": "^0.5.7",
+    "vue-amap": "0.5.10",
+    "vue-client": "1.24.51",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "webpack-parallel-uglify-plugin": "^1.0.0"
+  },
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js --single-run",
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/management_modules.git"
+  },
+  "keywords": [
+    "manage"
+  ],
+  "author": "liuxudong",
+  "license": "ISC"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.111",
+  "version": "3.3.112-xinkang",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/businessquery/GasInspection.vue

@@ -19,7 +19,7 @@
                           style="width:60%"
                           :value.sync="model.startDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>
             </div>
@@ -30,7 +30,7 @@
                           style="width:60%"
                           :value.sync="model.endDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>
             </div>
@@ -64,22 +64,6 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">客户状态&emsp;  </label>
-              <v-select :value.sync="model.f_user_state"
-                        v-model="model.f_user_state"
-                        :options='$parent.$parent.userstates' placeholder='请选择'
-                        condition="f_user_state = '{}'"
-                        close-on-select></v-select>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">气表状态&emsp;</label>
-              <v-select :value.sync="model.f_table_state"
-                        v-model="model.f_table_state"
-                        :options='$parent.$parent.tablestate' placeholder='请选择'
-                        condition="f_table_state = '{}'"
-                        close-on-select></v-select>
-            </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">表&emsp;&emsp;号&emsp;</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
@@ -141,7 +125,7 @@
                         condition="f_book_slice_area = '{}'"></v-select>
             </div>
             <div class="col-sm-2 ">
-              <label for="f_meter_classify"class="font_normal_body">表类型&emsp;&emsp;</label>
+              <label for="f_meter_classify"class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表类型</label>
               <v-select id="f_meter_classify"
                         v-model="model.meter_classify"
                         placeholder='表类型'
@@ -303,8 +287,8 @@
     self.initParams()
     self.initSlice(self.$login.f.orgid)
     let year = new Date().getFullYear()
-    self.$refs.paged.$refs.cri.model.startDate =  year+'-01-01 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate =  self.$login.toStandardDateString() + ' 23:59:59'
+    self.$refs.paged.$refs.cri.model.startDate =  year+'-01-01'
+    self.$refs.paged.$refs.cri.model.endDate =  self.$login.toStandardDateString()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
@@ -495,15 +479,15 @@
           a += ` and f_book_slice_area = '${this.$refs.paged.$refs.cri.model.model.f_book_slice_area}'`
         }
         if(this.$refs.paged.$refs.cri.model.startDate){
-          this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate}' `
+          this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate} 00:00:00' `
         }else{
-          this.model.params.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+          this.model.params.startDate ='DATEADD(yy,DATEDIFF(yy,0,getdate()),0)'
         }
 
         if(this.$refs.paged.$refs.cri.model.endDate){
-          this.model.params.endDate = `'${this.$refs.paged.$refs.cri.model.endDate}' `
+          this.model.params.endDate = `'${this.$refs.paged.$refs.cri.model.endDate} 23:59:59' `
         }else{
-          this.model.params.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+          this.model.params.endDate ='DATEADD(SS,-1,DATEADD(DD,1,CONVERT(DATETIME,CONVERT(VARCHAR(10),GETDATE(),120))))'
         }
         this.mycondition = a
         args.condition = args.condition+ ` ${this.filialeCodeStr}`
@@ -530,12 +514,6 @@
 
     },
     computed: {
-      userstates (){
-       return this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : []
-      },
-      tablestate() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
-      },
       getfield() {
         return exportConfig.gasInspectionConfig
       },
@@ -560,18 +538,18 @@
         result.condition = result.condition + this.mycondition
         let temp2 = this.$refs.paged.$refs.cri
         if (temp2.model.startDate && temp2.model.endDate) {
-          result.startDate = ` '${temp2.model.startDate}'`
-          result.endDate = ` '${temp2.model.endDate}'`
+          result.startDate = ` '${temp2.model.startDate} 00:00:00'`
+          result.endDate = ` '${temp2.model.endDate} 23:59:59'`
         } if (!temp2.model.startDate && !temp2.model.endDate) {
-          result.startDate =  this.$login.toStandardDateString() + ' 00:00:00'
-          result.endDate =  this.$login.toStandardDateString() + ' 23:59:59'
+          result.startDate = 'new Date().getFullYear()'
+          result.endDate = 'DATEADD(SS,-1,DATEADD(DD,1,CONVERT(DATETIME,CONVERT(VARCHAR(10),GETDATE(),120))))'
         }
           if (temp2.model.startDate&&!temp2.model.endDate) {
-            result.startDate = ` '${temp2.model.startDate}'`
-            result.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+            result.startDate = ` '${temp2.model.startDate} 00:00:00'`
+            result.endDate = 'DATEADD(SS,-1,DATEADD(DD,1,CONVERT(DATETIME,CONVERT(VARCHAR(10),GETDATE(),120))))'
           } if (temp2.model.endDate&&!temp2.model.startDate) {
-            result.startDate = this.$login.toStandardDateString() + ' 00:00:00'
-            result.endDate = ` '${temp2.model.endDate}'`
+            result.startDate = 'new Date().getFullYear()'
+            result.endDate = ` '${temp2.model.endDate} 23:59:59'`
           }
         if (temp2.model.contain_newfile==='否'){
           result.condition = result.condition+" and f_open_date not between " + result.startDate + " and " + result.endDate

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -519,7 +519,9 @@
             getCondition() {
                 let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
                 return {
-                    condition: condition
+                    condition: condition,
+                    startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
+                    endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
                 }
             },
             usertypes() {

package/src/filiale/haile/sale/businessquery/ChargeQuery.vue

@@ -345,9 +345,6 @@
                   <nobr>收费编号</nobr>
                 </th>
                 <th>
-                  <nobr>用户档案备注</nobr>
-                </th>
-                <th>
 <!--                  <nobr>客户编号</nobr>-->
                   <data-order field="f_userinfo_code" name="客户编号"
                               :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
@@ -408,6 +405,9 @@
                   <data-order field="f_operate_date" name="收费日期"
                               :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
+                <th>
+                  <nobr>用户档案备注</nobr>
+                </th>
                 <th>
                   <nobr>优惠金额</nobr>
                 </th>
@@ -561,9 +561,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.id}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_user_comments}}</nobr>
-              </td>
               <td style="text-align: center;"><nobr>
                 <nobr>{{row.f_userinfo_code}}</nobr>
               </nobr> </td>
@@ -622,6 +619,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_comments}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_privilege_money}}</nobr>
               </td>

package/src/filiale/tongchuan/ChargeQuery.vue

@@ -42,7 +42,6 @@
                   <read-card :is-single.sync="$parent.$parent.isSingleUser" @read-info="$parent.$parent.cardBtn"  v-ref:readcard></read-card>
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
-                  <button class="button_clear  button_spacing" @click="$parent.$parent.serialNumber">流水号补录</button>
 
                   <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
@@ -82,7 +81,7 @@
                          condition="f_address like '%{}%'" placeholder='客户地址'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" style="letter-spacing: 2em;margin-right: -2em">小区</label>
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
                   <v-select :value.sync="model.f_residential_area"
                             class="select_list select"
                             v-model="model.f_residential_area"
@@ -95,7 +94,7 @@
                 </div>
                 <div
                   class="col-sm-2 form-group">
-                  <label class="font_normal_body" style="letter-spacing: 2em;margin-right: -2em" >区域</label>
+                  <label class="font_normal_body">区&nbsp;&nbsp;&nbsp;&nbsp;域</label>
                   <v-select
                     v-model="model.f_pcd"
                     placeholder='选择区域'
@@ -330,26 +329,18 @@
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" style="letter-spacing: 0.5em;margin-right: -0.5em">终端号</label>
+                  <label class="font_normal_body">终端号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_terminal_num"
                          condition="f_terminal_num like '{}'" placeholder='终端号'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" style="letter-spacing: 0.5em;margin-right: -0.5em">壁挂炉</label>
+                  <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>
                   <v-select :value.sync="model.isbgl"
                             v-model="model.isbgl"
                             :options='$parent.$parent.bgl' placeholder='请选择'
                             condition="isbgl = '{}'"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" style="text-align: center;letter-spacing: 0.5em;margin-right: -0.5em">是否有<br/>流水号</label>
-                  <v-select :value.sync="model.ishaisnumber"
-                            v-model="model.ishaisnumber"
-                            :options='$parent.$parent.ishaisnumberoption' placeholder='请选择'
-                            condition="{}"
-                            close-on-select></v-select>
-                </div>
               </div>
             </div>
           </criteria>
@@ -795,25 +786,6 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-    <modal :show.sync="serialNumberModelShow" v-if="serialNumberModelShow" style="width:auto;"  v-ref:modal middle backdrop="false">
-      <article slot="modal-body">
-        <div style="text-align: center"  class="row">
-
-        <file-upload  style="margin-left:100px;padding-top:20px" class="my-file-uploader" :name="'myFile' + uuid"
-                      action="rs/file/uploadFile" tagname="文件上传"
-                      accept=".doc, .docx, .xls, .xlsx, .jpg, .png, .gif, .bmp, .avi, .mp4, .wmv, .rmvb, .mov, .pdf"
-                      :headers="{'username': this.$login.f.name, 'blodid': uuid,'businessid':uuid, 'fremarks': '','defname':'','fusetype':'收费'}"
-                      v-ref:file></file-upload>
-        <div class="col-sm-8 form-group" style="margin-left:150px;padding-top:10px" :class="[!f_serial_number ? 'has-error' : '']">
-          <label class="font_normal_body">银行流水号</label>
-          <input type="text" style="width:60%" class="input_search" v-model="f_serial_number" placeholder='银行流水号'>
-        </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" :disabled="!f_serial_number" @click="serialNumberConfirm">确定</button>
-      </footer>
-    </modal>
   </div>
   <high-meter-idcard :show.sync="false"  v-ref:highcard  ></high-meter-idcard>
 </template>
@@ -862,11 +834,6 @@
      data() {
       return {
         IdCardInfo:'',
-        serialNumberShow : false,
-        serialNumberModelShow : false,
-        // 随机数uuid
-        uuid: '',
-        f_serial_number: '',
         card:'',
         isSingleUser: null,
         startDate1:'',
@@ -904,7 +871,6 @@
           dep:[],
           user:[]
         },
-        operatornames: [],
         model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
           f_pregas: 0,
           f_preamount: 0,
@@ -950,7 +916,6 @@
         writecard:[{label: '全部',value: ''},{label: '已写卡',value: '已写卡'},{label: '未写卡',value: '未写卡'},{label: '写卡失败',value: '写卡失败'}],
         bluetoothpackage:[{label: '全部',value: ''},{label: '发送成功',value: '发送成功'},{label: '执行成功',value: '执行成功'}],
         allorgid:[],
-        ishaisnumberoption:[{label: '全部', value: ''},{label: '是', value: ' f_serial_number is not null '},{label: '否', value: ' f_serial_number is null '}],
         tempfalg :false,
         lastorgstr:'',
         // pos设备列表
@@ -974,44 +939,7 @@
       })
     },
     methods: {
-      async serialNumber (){
-        if (!this.serialNumberShow){
-          this.$showAlert('仅当查询自己的现金缴费操作时才可以进行流水号补录', 'warning', 3000)
-          return
-        }
-        this.serialNumberModelShow = true
-        this.f_serial_number = ''
-        this.uuid = this.guid()
-      },
-      serialNumberConfirm() {
-        let param = {
-          uuid: this.uuid,
-          f_serial_number: this.f_serial_number,
-          startDate: this.$refs.paged.$refs.cri.model.startDate,
-          endDate: this.$refs.paged.$refs.cri.model.endDate,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem ? `${this.orderitem}` : " f_operate_date desc"
-        }
-        let http = new HttpResetClass()
-        http.load('POST', 'rs/logic/serialNumberUpdate', param,
-          {resolveMsg: '操作成功', rejectMsg: null}).then((res) => {
-          this.serialNumberModelShow=false;
-          this.row = res.data[0]
-          this.search()
-        }).catch((error) => {
-          this.serialNumberModelShow=false
-          this.$showAlert('操作失败', 'error', 3000)
-          this.search()
-        })
-      },
-      guid() {
-        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-          let r = Math.random() * 16 | 0,
-            v = c == 'x' ? r : (r & 0x3 | 0x8)
-          return v.toString(16)
-        })
-      },
-    // 获取设备下拉选
+      // 获取设备下拉选
       async getEquipment () {
         let HttpReset = new HttpResetClass()
         let param = {
@@ -1181,11 +1109,6 @@
           args.condition +=` and f_idnumber='${this.IdCardInfo}'`
         }
         this.model.search(args.condition, args.model)
-        let condition1 = this.operatornames.length && this.operatornames[0] === this.$login.f.id
-        let condition2 = this.$refs.paged.$refs.cri.model.f_payment.length && this.$refs.paged.$refs.cri.model.f_payment[0].indexOf('现金') > -1
-        console.log("========condition1",condition1)
-        console.log("========condition2",condition2)
-        this.serialNumberShow = condition1 && condition2
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
         this.card=''
         this.IdCardInfo=''
@@ -1217,7 +1140,8 @@
         this.orgCondtionStr = condition
         this.orgname = obj.orgnames[0]
         this.depname = obj.depnames[0]
-        this.operatornames = obj.operatornames
+
+
       },
       async updateParams() {
         await this.$MagLoadParams.loadParam(this.f_filialeid)
@@ -1254,17 +1178,6 @@
       'getidcard'(IdCard){
         // console.log(param)
         this.$refs.paged.$refs.cri.model.f_info_idnumber=IdCard.strID
-      },
-      'onFileUpload'(files,res){
-        if(res && res.id ){
-          let msg = '上传成功'
-          if(!this.f_serial_number){
-            msg = '上传成功,请填写流水号之后进行确认'
-          }
-          this.$showAlert(msg, 'success', 2000)
-        }else{
-          this.$showAlert('上传失败,请检查文件类型', 'warning', 2000)
-        }
       }
     },
     watch: {

package/src/filiale/tongchuan/sale.js

@@ -20,8 +20,4 @@ export default function () {
   Vue.component('inspect-list-gas', (resolve) => {
     require(['./InspectListGas'], resolve)
   })
-  // 用气稽查
-  Vue.component('gas-inspection', (resolve) => {
-    require(['./GasInspection'], resolve)
-  })
 }