manage-client 3.2.6 → 3.2.8-aode

package/src/components/SellReport/ManageGasPrice.vue

@@ -1,101 +1,74 @@
 <template>
-  <div class="basic-main" style="height: 98%">
+  <div id='app' >
     <criteria-paged :model="model" :pager='false' v-ref:paged>
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <p class="bg-info text-center" style="padding: 8px;">气价报表</p>
-        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-          <div class="row">
-            <div class="col-sm-4" >
-              <label class="font_normal_body" for="startDate">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+        <div novalidate class="form-inline auto " partial >
+          <p class="bg-info text-center" style="padding: 8px;">气价报表</p>
+          <div class="flex-row auto" style="justify-content: space-between">
+            <div class="form-group" v-if="!$parent.$parent.data.f_files_path">
+              <label for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期"
                           v-model="model.startDate"
                           :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>
-            <div class="col-sm-4" >
-              <label  class="font_normal_body" for="endDate">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+              <label for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>
+              <label for="endDate" class="control-label">组织机构</label>
+              <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes"></right-tree>
+              <button class="btn btn-primary width-100" @click="search()">查询</button>
+              <!--<button class="btn btn-success width-100" @click="$parent.$parent.confirmReport()">保存报表</button>-->
             </div>
-            <div class="col-sm-4">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
-              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
-            </div>
-            <div class="col-sm-4">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
-              <res-select restype='department'
-                          is-mul="false"
-                          @res-select="$parent.$parent.getdep"
-                          :parentresid="$parent.$parent.depresid"
-                          :initresid='$parent.$parent.depid'>
-              </res-select>
-
+            <span></span>
+            <div class="form-group">
+              <report-print id='gasprice' top='1cm' left='2cm' width='100%' height='100%'></report-print>
+              <report-excel id='gasprice' ></report-excel>
             </div>
-            <div class="col-sm-4">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
-              <res-select restype='user'
-                          is-mul="false"
-                          @res-select="$parent.$parent.getuser"
-                          :parentresid="$parent.$parent.userresid"
-                          :initresid='$parent.$parent.operatorid'>
-              </res-select>
-            </div>
-          </div>
-          <div class="span" style = "float:right;">
-            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%'></report-print>
-            <report-excel id='gasprice'></report-excel>
           </div>
         </div>
       </criteria>
-      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+      <div  partial='list' v-el:handcollect id='gasprice'>
         <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
           <thead>
           <tr>
-            <th colspan='9' style="font-weight: normal; text-align: left;">
+            <th colspan='5' style="font-weight: normal; text-align: left;">
               <h3 style="text-align: center">气价报表</h3>
             </th>
           </tr>
           <tr>
-            <th colspan='9' style="font-weight: normal; text-align: center;">
+            <th colspan='5' style="font-weight: normal; text-align: center;">
               开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}<br/>
-              打印时间：{{{$parent.printTime}}}
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;&nbsp;
             </th>
           </tr>
           <tr>
-            <th colspan='9' style="font-weight: normal; text-align: center;">
-              <div>
-                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
-                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
-                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
-              </div>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              组织机构：{{$parent.filialeNameStr}}
             </th>
           </tr>
           </thead>
           <tr>
-            <td colspan='9'>
+            <td colspan='5'>
               {{{ model.data.substring(26,model.data.length-8) }}}
             </td>
           </tr>
           <tfoot>
           <tr style="text-align: left">
-            <th colspan='3'>财务审核：</th>
-            <th colspan='3'>收款审核：</th>
-            <th colspan='3'>收款员：</th>
+            <th colspan='2'>财务审核：</th>
+            <th colspan='2'>收款审核：</th>
+            <th colspan='1'>收款员：</th>
           </tr>
           </tfoot>
         </table>
-        {{{ $parent.reportStr}}}
+        {{{ $parent.reportStr }}}
       </div>
     </criteria-paged>
     <modal :show.sync="show" v-ref:modal small backdrop="false">
@@ -112,9 +85,9 @@
         <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
       </footer>
     </modal>
+
   </div>
 </template>
-
 <script>
   import { DataModel } from 'vue-client'
   import co from 'co'
@@ -128,9 +101,9 @@
       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_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-gas-price',
       f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
-      f_outlets: this.$login.f.depname})
+      f_outlets: this.$login.f.f_parentname})
     if (saveBack.data.status === 'succeed') {
       self.show = false
       self.filename = ''
@@ -143,61 +116,35 @@
     props: ['data'],
     data () {
       return {
-        printTime: this.$login.toStandardTimeString(),
-        depresid: [],
-        userresid: [],
-        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/manage_gasprice', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
+          filialeCodeStr: 'this.model.filialeCodeStr', filiale: 'this.model.filiale'}),
         reportStr: null,
         show: false,
+        filename: '',
+        filialeNameStr: this.$login.f.orgpathnames,
+        filialeCodeStr: this.$login.f.orgpathstr,
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
       }
     },
     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'
+      if (this.data) {
+        this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
+        this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
+        this.$refs.paged.$refs.criteria.model.filiale = this.$login.f.f_fengongsi
+      }
       this.$refs.paged.$refs.criteria.search()
-      console.log(this.$login.f)
     },
     methods: {
-      searchData () {
-        this.$refs.paged.$refs.criteria.search()
-      },
       selfSearch (args) {
-        this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
-        if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in (' + this.f_depid + ')'
-        }
-        if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
-        }
-        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.$refs.criteria.model.filialeCodeStr = this.filialeCodeStr
         this.$refs.paged.search(args)
       },
-      getRes (obj) {
-        this.orgname = obj.res[0]
-        this.depresid = obj.resids
-        this.f_orgid = obj.resids
-      },
-      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(obj) {
+        console.log(obj, '组织')
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
       },
-
       // 根据文件路径获取储存的报表内容
       getFileContent (path) {
         this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -219,7 +166,7 @@
       confirmReport () {
         this.show = true
         this.filename = this.data.f_report_name + this.$login.toStandardDateString()
-      },
+      }
     },
     watch: {
       'data' (val) {
@@ -234,8 +181,3 @@
     }
   }
 </script>
-<style scoped>
-  .noborder{
-    border: none;
-  }
-</style>

package/src/components/SellReport/ManageHandInputtor.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="basic-main"  style="height: 100%">
+  <div class="basic-main">
   <criteria-paged :model="model" :pager='false' v-ref:paged>
     <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
         <p class="bg-info text-center" style="padding: 8px;">抄表情况汇总表</p>
@@ -27,11 +27,11 @@
               </datepicker>
             </div>
             <div class="col-sm-4">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
               <right-tree @re-res="$parent.$parent.getRes"></right-tree>
             </div>
             <div class="col-sm-4">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp;</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
               <res-select restype='department'
                           is-mul="false"
                           @res-select="$parent.$parent.getdep"
@@ -41,7 +41,7 @@
 
             </div>
             <div class="col-sm-4">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp;</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
               <res-select restype='user'
                           is-mul="false"
                           @res-select="$parent.$parent.getuser"
@@ -49,49 +49,31 @@
                           :initresid='$parent.$parent.operatorid'>
               </res-select>
             </div>
-          <div class="col-sm-4 form-group">
-            <label class="font_normal_body">抄&ensp;表&ensp;员</label>
-            <v-select :value.sync="model.f_inputtor"
-                      v-model="model.f_inputtor"
-                      :options='$parent.$parent.inputtor' placeholder='请选择'
-                      multiple = "true"
-                      close-on-select></v-select>
-          </div>
-          <div class="col-sm-4 form-group">
-            <label class="font_normal_body">用户类型</label>
-            <v-select :value.sync="model.f_user_type"
-                      :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                      close-on-select></v-select>
-          </div>
         </div>
           <div class="span" style = "float:right;">
             <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-             <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+             <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%'></report-print>
              <report-excel id='gasprice'></report-excel>
           </div>
         </div>
     </criteria>
-    <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-      <table class='tableprint' style="margin: 0px auto">
+    <div  partial='list' v-el:handcollect id='gasprice'>
+      <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
         <thead>
         <tr>
-          <th colspan='8' style="font-weight: normal; text-align: left;">
+          <th colspan='11' style="font-weight: normal; text-align: left;">
             <h3 style="text-align: center">抄表情况汇总表</h3>
           </th>
         </tr>
         <tr>
-          <th colspan='8' style="font-weight: normal; text-align: center;">
+          <th colspan='11' style="font-weight: normal; text-align: center;">
             开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-            结束时间：{{ model.model.endDate }}
-          </th>
-        </tr>
-        <tr>
-          <th colspan='8' style="font-weight: normal; text-align: center;">
-            打印时间：{{{$parent.printTime}}}
+            结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+
           </th>
         </tr>
         <tr>
-          <th colspan='8' style="font-weight: normal; text-align: center;">
+          <th colspan='11' style="font-weight: normal; text-align: center;">
             <div>
               <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
               <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
@@ -101,15 +83,15 @@
         </tr>
         </thead>
         <tr>
-          <td colspan='12'>
+          <td colspan='11'>
             {{{ model.data.substring(26,model.data.length-8) }}}
           </td>
         </tr>
         <tfoot>
         <tr style="text-align: left">
           <th colspan='3'>财务审核：</th>
-          <th colspan='3'>收款审核：</th>
-          <th colspan='2'>收款员：</th>
+          <th colspan='4'>收款审核：</th>
+          <th colspan='4'>收款员：</th>
         </tr>
         </tfoot>
       </table>
@@ -172,8 +154,6 @@
         orgname: '',
         depname: '',
         operatorname: '',
-        f_inputtor:[],
-        f_user_type:'',
         orgCondtionStr: '1=1',
         model: new DataModel('rs/report/gethandinputtor', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
           f_orgid: 'this.model.f_orgid'}),
@@ -192,29 +172,14 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
-        console.log('f_inputtor='+this.f_inputtor)
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'h.f_orgid in (' + this.f_orgid + ')'
+        let orgcondition = 'f_orgid = ' + this.f_orgid
         if (this.f_depid[0]) {
-          orgcondition += ' and h.f_depid in (' + this.f_depid + ')'
+          orgcondition += ' and f_depid = ' + this.f_depid
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and h.f_operatorid in (' + this.f_operatorid + ')'
+          orgcondition += ' and f_operatorid = ' + this.f_operatorid
         }
-        if(this.$refs.paged.$refs.criteria.model.f_user_type!=''){
-          orgcondition += ' and h.f_user_type = ' + `'${this.$refs.paged.$refs.criteria.model.f_user_type}'`
-        }
-        if(this.$refs.paged.$refs.criteria.model.f_inputtor!='') {
-          orgcondition += ' and h.f_inputtor in ('
-          this.$refs.paged.$refs.criteria.model.f_inputtor.forEach(function (item,index) {
-            if(index==0 &&item!=''){
-              orgcondition +="'"+item+"'"
-            }else if(index>0&&item!='')
-              orgcondition +=",'"+item+"'"
-          })
-          orgcondition += ")"
-        }
-
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)
       },
@@ -232,6 +197,7 @@
         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) => {
@@ -265,12 +231,6 @@
       }
     },
     computed: {
-      usertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      inputtor() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
-      },
     }
   }
 </script>