manage-client 3.1.13 → 3.1.14-ls

package/src/components/SellReport/ManageMonthGas.vue

@@ -26,7 +26,7 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+            <res-select-group :initres="$parent.$parent.initres" :show-component=['company','department','operator'] :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">收费状态</label>
               <v-select :value.sync="$parent.$parent.f_state"
@@ -110,140 +110,140 @@
 </template>
 
 <script>
-  import { DataModel } from 'vue-client'
-  import co from 'co'
-  let saveFile = function * (self) {
-    // 线验证文件是否重名
-    let count = yield self.$resetpost('rs/sql/manageSingleTable',
-      {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
-      {resolveMsg: null, rejectMsg: null})
-    if (count.data.length > 0) {
-      self.$showAlert('无法保存，文件名重名', 'warning', 3000)
-      return
-    }
-    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
-      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
-      f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
-      f_outlets: this.$login.f.depname})
-    if (saveBack.data.status === 'succeed') {
-      self.show = false
-      self.filename = ''
-      // 后台保存完成，通知刷新
-      self.$dispatch('save-success', self.filename)
-    }
+import { DataModel } from 'vue-client'
+import co from 'co'
+let saveFile = function * (self) {
+  // 线验证文件是否重名
+  let count = yield self.$resetpost('rs/sql/manageSingleTable',
+    {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+    {resolveMsg: null, rejectMsg: null})
+  if (count.data.length > 0) {
+    self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+    return
   }
-  export default {
-    title: '月售气量汇总表',
-    props: ['data'],
-    data () {
-      return {
-        printTime: this.$login.toStandardTimeString(),
-        depresid: [],
-        userresid: [],
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
-        },
-        f_orgid: this.$login.f.orgid,
-        f_depid: this.$login.f.depids,
-        f_operatorid: this.$login.f.id,
-        operatorid: [],
-        depid: [],
-        orgname: '',
-        depname: '',
-        f_state:['有效'],
-        operatorname: '',
-        orgCondtionStr: '1=1',
-        model: new DataModel('rs/report/manage_month_sellgas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
-        reportStr: null,
-        show: false,
-        spans: ''
-      }
+  let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+    f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+    f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+    f_outlets: this.$login.f.depname})
+  if (saveBack.data.status === 'succeed') {
+    self.show = false
+    self.filename = ''
+    // 后台保存完成，通知刷新
+    self.$dispatch('save-success', self.filename)
+  }
+}
+export default {
+  title: '月售气量汇总表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      initres: {
+        org:[this.$login.f.orgid],
+        dep:[],
+        user:[]
+      },
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      f_state:['有效'],
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/manage_month_sellgas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      show: false,
+      spans: ''
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    // this.$refs.paged.$refs.criteria.search()
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
     },
-    ready () {
-      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
-      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
-      // this.$refs.paged.$refs.criteria.search()
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgstr = this.orgCondtionStr
+      args.condition = `${args.condition} ` + orgstr
+      this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
+      this.$refs.paged.search(args)
     },
-    methods: {
-      searchData () {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfSearch (args) {
-        this.printTime = this.$login.toStandardTimeString()
-        let orgstr = this.orgCondtionStr
-        args.condition = `${args.condition} ` + orgstr
-        this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
-        this.$refs.paged.search(args)
-      },
-      getRes (condition, obj) {
-        this.orgCondtionStr = condition
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
-      },
-      // getdep (obj, val) {
-      //   // this.depname = val[0]
-      //   this.userresid = obj
-      //   this.f_depid = obj
-      // },
-      // getuser ( obj, val) {
-      //   this.operatorname = val[0]
-      //   this.f_operatorid = obj
-      // },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+    },
+    // getdep (obj, val) {
+    //   // this.depname = val[0]
+    //   this.userresid = obj
+    //   this.f_depid = obj
+    // },
+    // getuser ( obj, val) {
+    //   this.operatorname = val[0]
+    //   this.f_operatorid = obj
+    // },
 
-      // 根据文件路径获取储存的报表内容
-      getFileContent (path) {
-        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          this.reportStr = res.data.filecontent
-          this.model.state = '正确'
-        })
-      },
-      confirm () {
-        if (!this.filename || this.filename === '') {
-          this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
-        }
-        let saveGen = saveFile(this)
-        co(saveGen)
-      },
-      close () {
-        this.show = false
-      },
-      // 将报表保存成文件
-      confirmReport () {
-        this.show = true
-        this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+    // 根据文件路径获取储存的报表内容
+    getFileContent (path) {
+      this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.reportStr = res.data.filecontent
+        this.model.state = '正确'
+      })
+    },
+    confirm () {
+      if (!this.filename || this.filename === '') {
+        this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
       }
+      let saveGen = saveFile(this)
+      co(saveGen)
     },
-    watch: {
-      'data' (val) {
-        if (val.f_files_path) {
-          this.getFileContent(val.f_files_path)
-        } else {
-          this.reportStr = null
-        }
-      },
-      'model.data' (val) {
-        let tab = document.getElementById('test').children[0]
-        var tds = tab.getElementsByTagName('td')
-        var num = 0
-        for (let td of tds) {
-          let span = td.getAttribute('colspan')
-          num = num + ((span ? span : 1) - 0)
-        }
-        this.spans = num
+    close () {
+      this.show = false
+    },
+    // 将报表保存成文件
+    confirmReport () {
+      this.show = true
+      this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+    }
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
       }
     },
-    computed: {
-      charge_state() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    'model.data' (val) {
+      let tab = document.getElementById('test').children[0]
+      var tds = tab.getElementsByTagName('td')
+      var num = 0
+      for (let td of tds) {
+        let span = td.getAttribute('colspan')
+        num = num + ((span ? span : 1) - 0)
       }
+      this.spans = num
+    }
+  },
+  computed: {
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
     }
   }
+}
 </script>
 <style scoped>
-  .noborder{
-    border: none;
-  }
+.noborder{
+  border: none;
+}
 </style>

package/src/components/SellReport/ManageOtherCharge.vue

@@ -52,7 +52,7 @@
         </div>
       </criteria>
       <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+        <table class='tableprint' style="margin: 0px auto">
           <thead>
           <tr>
             <th colspan='{{$parent.spans}}' style="font-weight: bold; text-align: left;">
@@ -115,136 +115,136 @@
 </template>
 
 <script>
-  import { DataModel } from 'vue-client'
-  import co from 'co'
-  let saveFile = function * (self) {
-    // 线验证文件是否重名
-    let count = yield self.$resetpost('rs/sql/manageSingleTable',
-      {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
-      {resolveMsg: null, rejectMsg: null})
-    if (count.data.length > 0) {
-      self.$showAlert('无法保存，文件名重名', 'warning', 3000)
-      return
-    }
-    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
-      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
-      f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
-      f_outlets: this.$login.f.depname})
-    if (saveBack.data.status === 'succeed') {
-      self.show = false
-      self.filename = ''
-      // 后台保存完成，通知刷新
-      self.$dispatch('save-success', self.filename)
-    }
+import { DataModel } from 'vue-client'
+import co from 'co'
+let saveFile = function * (self) {
+  // 线验证文件是否重名
+  let count = yield self.$resetpost('rs/sql/manageSingleTable',
+    {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+    {resolveMsg: null, rejectMsg: null})
+  if (count.data.length > 0) {
+    self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+    return
   }
-  export default {
-    title: '其他收费汇总',
-    props: ['data'],
-    data () {
-      return {
-        printTime: this.$login.toStandardTimeString(),
-        depresid: [],
-        userresid: [],
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
-        },
-        f_orgid: this.$login.f.orgid,
-        f_depid: this.$login.f.depids,
-        f_operatorid: this.$login.f.id,
-        operatorid: [],
-        depid: [],
-        orgname: '',
-        depname: '',
-        operatorname: '',
-        orgCondtionStr: '1=1',
-        model: new DataModel('rs/report/othercharge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
-        reportStr: null,
-        show: false,
-        spans: ''
-      }
+  let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+    f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+    f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+    f_outlets: this.$login.f.depname})
+  if (saveBack.data.status === 'succeed') {
+    self.show = false
+    self.filename = ''
+    // 后台保存完成，通知刷新
+    self.$dispatch('save-success', self.filename)
+  }
+}
+export default {
+  title: '其他收费汇总',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      initres: {
+        org:[this.$login.f.orgid],
+        dep:[],
+        user:[]
+      },
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/othercharge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      show: false,
+      spans: ''
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    // this.$refs.paged.$refs.criteria.search()
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
     },
-    ready () {
-      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
-      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
-      // this.$refs.paged.$refs.criteria.search()
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgstr = this.orgCondtionStr
+      args.condition = `${args.condition} ` + orgstr
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgstr
+      this.$refs.paged.search(args)
     },
-    methods: {
-      searchData () {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfSearch (args) {
-        this.printTime = this.$login.toStandardTimeString()
-        let orgstr = this.orgCondtionStr
-        args.condition = `${args.condition} ` + orgstr
-        this.$refs.paged.$refs.criteria.model.f_orgid = orgstr
-        this.$refs.paged.search(args)
-      },
-      getRes (condition, obj) {
-        this.orgCondtionStr = condition
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
-      },
-      // getdep (obj, val) {
-      //   // this.depname = val[0]
-      //   this.userresid = obj
-      //   this.f_depid = obj
-      // },
-      // getuser ( obj, val) {
-      //   this.operatorname = val[0]
-      //   this.f_operatorid = obj
-      // },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+    },
+    // getdep (obj, val) {
+    //   // this.depname = val[0]
+    //   this.userresid = obj
+    //   this.f_depid = obj
+    // },
+    // getuser ( obj, val) {
+    //   this.operatorname = val[0]
+    //   this.f_operatorid = obj
+    // },
 
-      // 根据文件路径获取储存的报表内容
-      getFileContent (path) {
-        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          this.reportStr = res.data.filecontent
-          this.model.state = '正确'
-        })
-      },
-      confirm () {
-        if (!this.filename || this.filename === '') {
-          this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
-        }
-        let saveGen = saveFile(this)
-        co(saveGen)
-      },
-      close () {
-        this.show = false
-      },
-      // 将报表保存成文件
-      confirmReport () {
-        this.show = true
-        this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+    // 根据文件路径获取储存的报表内容
+    getFileContent (path) {
+      this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.reportStr = res.data.filecontent
+        this.model.state = '正确'
+      })
+    },
+    confirm () {
+      if (!this.filename || this.filename === '') {
+        this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
       }
+      let saveGen = saveFile(this)
+      co(saveGen)
     },
-    watch: {
-      'data' (val) {
-        if (val.f_files_path) {
-          this.getFileContent(val.f_files_path)
-        } else {
-          this.reportStr = null
-        }
-      },
-      'model.data' (val) {
-        let tab = document.getElementById('test').children[0]
-        var tds = tab.getElementsByTagName('td')
-        var num = 0
-        for (let td of tds) {
-          let span = td.getAttribute('colspan')
-          num = num + ((span ? span : 1) - 0)
-        }
-        this.spans = num
+    close () {
+      this.show = false
+    },
+    // 将报表保存成文件
+    confirmReport () {
+      this.show = true
+      this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+    }
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
       }
     },
-    computed: {
+    'model.data' (val) {
+      let tab = document.getElementById('test').children[0]
+      var tds = tab.getElementsByTagName('td')
+      var num = 0
+      for (let td of tds) {
+        let span = td.getAttribute('colspan')
+        num = num + ((span ? span : 1) - 0)
+      }
+      this.spans = num
     }
+  },
+  computed: {
   }
+}
 </script>
 <style scoped>
-  .noborder{
-    border: none;
-  }
+.noborder{
+  border: none;
+}
 </style>