manage-client 3.2.83-2 → 3.2.83-aode

package/src/components/SellReport/GasPrice.vue

@@ -1,120 +1,93 @@
 <template>
-  <div class="basic-main" style="height: 98%">
-    <criteria-paged :model="model" :pager='false' v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+<div id='app' >
+  <criteria-paged :model="model" :pager='false' v-ref:paged>
+    <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+      <div novalidate class="form-inline auto " partial >
         <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%"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :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%"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </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>
-
-            </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 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  00:00:00'"
+            :show-reset-button="reset">
+          </datepicker>
+          <label for="endDate">结束日期:</label>
+          <datepicker id="endDate" placeholder="结束日期"
+            v-model="model.endDate"
+            :value.sync="model.endDate"
+            :disabled-days-of-Week="[]"
+            :format="'yyyy-MM-dd 23:59:59'"
+            :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-success width-100" @click="search()">查询</button>
+          <button class="btn btn-success" @click="$parent.$parent.confirmReport()">保存报表</button>
           </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-excel id='gasprice'></report-excel>
+          <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>
-      </criteria>
-      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto;">
-          <thead>
+      </div>
+    </criteria>
+    <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='18' style="font-weight: normal; text-align: left;">
+            <th colspan='7' style="font-weight: normal; text-align: left;">
               <h3 style="text-align: center">气价明细报表</h3>
             </th>
           </tr>
           <tr>
-            <th colspan='18' style="font-weight: normal; text-align: center;">
+            <th colspan='7' style="font-weight: normal; text-align: center;">
               开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
-              打印时间：{{{$parent.printTime}}}
+              结束时间：{{ model.model.endDate }}
             </th>
           </tr>
           <tr>
-            <th colspan='18' 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='7' style="font-weight: normal; text-align: center;">
+              组织机构：{{$parent.filialeNameStr}}
             </th>
           </tr>
-          </thead>
+        </thead>
           <tr>
-            <td colspan='18'>
-              {{{ model.data.substring(26,model.data.length-8) }}}
+            <td colspan='7'>
+          {{{ model.data.substring(26,model.data.length-8) }}}
             </td>
-          </tr>
-          <tfoot>
+        </tr>
+        <tfoot>
           <tr style="text-align: left">
-            <th colspan='6'>财务审核：</th>
-            <th colspan='6'>收款审核：</th>
-            <th colspan='6'>收款员：</th>
+            <th colspan='2'>财务审核：</th>
+            <th colspan='2'>收款审核：</th>
+            <th colspan='3'>收款员：</th>
           </tr>
-          </tfoot>
-        </table>
-        {{{ $parent.reportStr}}}
+        </tfoot>
+      </table>
+       {{{ $parent.reportStr }}}
+     </div>
+  </criteria-paged>
+
+  <modal :show.sync="show" v-ref:modal small backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <h4 class="modal-title">输入文件名称</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
       </div>
-    </criteria-paged>
-    <modal :show.sync="show" v-ref:modal small backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h4 class="modal-title">输入文件名称</h4>
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <div class="form-group">
-          <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
-        <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
-      </footer>
-    </modal>
-  </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+      <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: '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 = ''
@@ -139,65 +112,39 @@
     }
   }
   export default {
-    title: '气价明细报表',
+    title: '气价明细表',
     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/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'
-      console.log(this.$login.f)
+      if (this.data) {
+        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.model.filiale = this.$login.f.f_fengongsi
+      }
+      this.$refs.paged.$refs.criteria.search()
     },
     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
+      getRes(obj) {
+        console.log(obj, '组织')
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
       },
-      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) => {
@@ -219,7 +166,7 @@
       confirmReport () {
         this.show = true
         this.filename = this.data.f_report_name + this.$login.toStandardDateString()
-      },
+      }
     },
     watch: {
       'data' (val) {
@@ -234,11 +181,3 @@
     }
   }
 </script>
-<style scoped>
-  .noborder{
-    border: none;
-  }
-  .fontSize{
-    font-size: 13px;
-  }
-</style>

package/src/components/SellReport/GetSummary.vue

@@ -0,0 +1,186 @@
+  <template>
+  <div id='app' >
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:criteria>
+        <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'"
+              :show-reset-button="reset">
+            </datepicker>
+            <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'"
+              :show-reset-button="reset">
+            </datepicker>
+            <label for="f_outlets">营业网点:</label>
+           <v-select :value.sync="model.outlets" v-model='model.outlets'
+                 :options='$parent.$parent.outlets' placeholder='营业网点'
+                 close-on-select v-el:cc></v-select>
+           <label for="f_inputtor">操作员:</label>
+           <v-select :value.sync="model.operator" v-model='model.operator'
+                       :options='$parent.$parent.operator' placeholder='操作员'
+                       close-on-select v-el:cc></v-select>
+            <button class="btn btn-primary width-100" @click="search()">查询</button>
+            <button class="btn btn-success width-100" @click="$parent.$parent.confirmReport()">保存报表</button>
+            </div>
+            <span></span>
+            <div class="form-group">
+              <report-print id='getsummary' top='1cm' left='2cm' width='100%' height='100%'></report-print>
+              <report-excel id='getsummary' ></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='getsummary'>
+        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+          <thead>
+            <tr>
+              <th colspan='11' style="font-weight: normal; text-align: left;">
+                <h3 style="text-align: center">天然气综合销售报表</h3>
+              </th>
+            </tr>
+            <tr>
+              <th colspan='11' style="font-weight: normal; text-align: center;">
+                开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+                结束时间：{{ model.model.endDate }}&nbsp;&nbsp;&nbsp;
+              </th>
+            </tr>
+            <tr>
+              <th colspan='11' style="font-weight: normal; text-align: center;">
+                营业网点：{{model.model.outlets}}&nbsp;&nbsp;&nbsp;
+                操作员：{{model.model.operator}}
+              </th>
+            </tr>
+          </thead>
+            <tr>
+              <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='4'>收款审核：</th>
+              <th colspan='4'>收款员：</th>
+            </tr>
+          </tfoot>
+        </table>
+         {{{ $parent.reportStr }}}
+       </div>
+       <!-- <div partial='list' v-el:handcollect v-if="data.f_files_path">
+
+       </div> -->
+    </criteria-paged>
+
+    <modal :show.sync="show" v-ref:modal small backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">输入文件名称</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+        <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 * as Util from '../../Util'
+import AppData from '../../stores/AppData'
+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: 'get-summary',
+    f_operator: Util.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+    f_outlets: Util.f.f_parentname})
+
+    if (saveBack.data.status === 'succeed') {
+      self.show = false
+      self.filename = ''
+      // 后台保存完成，通知刷新
+      self.$dispatch('save-success', self.filename)
+    }
+}
+
+export default {
+  title: '天然气综合销售报表',
+  props: ['data'],
+  data () {
+    return {
+      model: new DataModel('rs/report/getsummary', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+      outlets: 'this.model.outlets[0]', operator: 'this.model.operator[0]', filiale: `'${Util.f.f_fengongsi}'`}),
+      reportStr: null,
+      show: false,
+      filename: ''
+    }
+  },
+  methods: {
+    // 根据文件路径获取储存的报表内容
+    getFileContent (path) {
+      //console.log('2222222222222222', 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 + Util.toStandardDateString()
+    }
+  },
+  computed: {
+    outlets () {
+      return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
+    },
+    operator () {
+      return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
+    }
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
+      }
+    }
+  }
+}
+</script>