npm - manage-client - Versions diffs - 3.2.8 → 3.2.10-aode - Mend

manage-client 3.2.8 → 3.2.10-aode

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (752) hide show

package/src/components/SellReport/HandplanBili.vue CHANGED Viewed

@@ -1,241 +1,73 @@
 <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>
-        <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>
-          <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>
+  <div id='app' >
+    <criteria-paged :model="model" :pager='false'>
+      <criteria partial='criteria' @condition-changed='search'>
+        <div novalidate class="form-inline auto" partial>
+          <div class="form-group">
+            <label for="startDate">开始日期:</label>
+            <datepicker id="startDate" placeholder="开始日期"
+                        v-model="model.startDate"
+                        :value.sync="model.startDate"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd'"
+                        :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'"
+                        :show-reset-button="reset">
+            </datepicker>
+            <button class="btn btn-default" @click="search()">查询</button>
+            <report-print id='shexian' top='1cm' left='1cm' width='100%' height='100%'></report-print>
+            <report-excel id='shexian'></report-excel>
           </div>
         </div>
       </criteria>
-      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: auto">
-        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+      <div partial='list' id='shexian'>
+        <table class='tableprint' style="margin: 0px auto">
           <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 }}&nbsp;&nbsp;<br/>
-              打印时间：{{{$parent.printTime}}}
-            </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>
+              结束时间：{{ model.model.endDate }}
             </th>
           </tr>
           </thead>
           <tr>
-            <td colspan='9'>
+            <th  colspan='5' style="font-weight: normal;">
               {{{ 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>
           </tr>
-          </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>
-      </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'
-  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)
-    }
-  }
   export default {
     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/getCharge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
-        reportStr: null,
-        show: false,
-      }
-    },
-    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()
-      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.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
-      },
-      // 根据文件路径获取储存的报表内容
-      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()
-      },
-    },
-    watch: {
-      'data' (val) {
-        if (val.f_files_path) {
-          this.getFileContent(val.f_files_path)
-        } else {
-          this.reportStr = null
-        }
+        model: new DataModel('rs/report/getCharge',{startDate: 'this.model.startDate', endDate: 'this.model.endDate'})
       }
     },
     computed: {
+      // outlets () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
+      // },
+      // operator () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
+      // }
     }
   }
 </script>
-<style scoped>
-  .noborder{
-    border: none;
-  }
-</style>

package/src/components/SellReport/JinChengBusSummary.vue CHANGED Viewed

@@ -29,7 +29,7 @@
             </div>
             <span></span>
             <div class="form-group">
-              <report-print id='gasprice' preview="true" top='1cm' left='2cm' width='100%' height='100%' :preview="true"></report-print>
+              <report-print id='gasprice' preview="true" top='1cm' left='2cm' width='100%' height='100%'></report-print>
               <report-excel id='gasprice' ></report-excel>
             </div>
           </div>

package/src/components/SellReport/JinChengHandGas.vue CHANGED Viewed

@@ -29,7 +29,7 @@
             </div>
             <span></span>
             <div class="form-group">
-              <report-print id='gasprice' preview="true" top='1cm' left='2cm' width='100%' height='100%' :preview="true"></report-print>
+              <report-print id='gasprice' preview="true" top='1cm' left='2cm' width='100%' height='100%'></report-print>
               <report-excel id='gasprice' ></report-excel>
             </div>
           </div>

package/src/components/SellReport/JinChengOperSummary.vue CHANGED Viewed

@@ -29,7 +29,7 @@
             </div>
             <span></span>
             <div class="form-group">
-              <report-print id='gasprice' preview="true" top='1cm' left='2cm' width='100%' height='100%' :preview="true"></report-print>
+              <report-print id='gasprice' preview="true" top='1cm' left='2cm' width='100%' height='100%'></report-print>
               <report-excel id='gasprice' ></report-excel>
             </div>
           </div>

package/src/components/SellReport/JinChengSliceSumgas.vue CHANGED Viewed

@@ -29,7 +29,7 @@
             </div>
             <span></span>
             <div class="form-group">
-              <report-print id='gasprice' preview="true" top='1cm' left='2cm' width='100%' height='100%' :preview="true"></report-print>
+              <report-print id='gasprice' preview="true" top='1cm' left='2cm' width='100%' height='100%'></report-print>
               <report-excel id='gasprice' ></report-excel>
             </div>
           </div>

package/src/components/SellReport/ManageBusSummary.vue CHANGED Viewed

@@ -1,13 +1,12 @@
 <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>
       <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">
-          <res-select-group :mul="false" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:res></res-select-group>
-            <div class="col-sm-2 form-group" >
+            <div class="col-sm-4" >
               <label class="font_normal_body" for="startDate">开始日期:</label>
               <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
                           v-model="model.startDate"
@@ -17,7 +16,7 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-2 form-group" >
+            <div class="col-sm-4" >
               <label  class="font_normal_body" for="endDate">结束日期:</label>
               <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
                           v-model="model.endDate"
@@ -27,59 +26,72 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-          <div class="col-sm-2 form-group">
-            <label class="font_normal_body">收费状态</label>
-            <v-select :value.sync="$parent.$parent.f_state" multiple
-                      v-model="$parent.$parent.f_state"
-                      :options='$parent.$parent.charge_state' placeholder='请选择'
-                      condition="f_state in {}"
-                      close-on-select></v-select>
-          </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>
           <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='$parent.spans' style="font-weight: normal; text-align: left;">
+          <th colspan='9' style="font-weight: normal; text-align: left;">
             <h3 style="text-align: center">收费结账报表</h3>
           </th>
         </tr>
         <tr>
-          <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+          <th colspan='9' style="font-weight: normal; text-align: center;">
             开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-            结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
-            <!--打印时间：{{{$parent.printTime}}}-->
-            打印时间：{{$parent.printTime}}
-            <!--收费员：{{// $parent.operatorname}}-->
+            结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+            打印时间：{{{$parent.printTime}}}
           </th>
         </tr>
         <tr>
-          <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+          <th colspan='9' style="font-weight: normal; text-align: center;">
             <div>
-              <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
-              <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
-              <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
+              <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>
         </tr>
         </thead>
         <tr>
-          <td :colspan='$parent.spans'>
+          <td colspan='9'>
             {{{ model.data.substring(26,model.data.length-8) }}}
           </td>
         </tr>
         <tfoot>
         <tr style="text-align: left">
-          <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
-          <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
-          <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
+          <th colspan='3'>财务审核：</th>
+          <th colspan='3'>收款审核：</th>
+          <th colspan='3'>收款员：</th>
         </tr>
         </tfoot>
       </table>
@@ -143,22 +155,16 @@
         depname: '',
         operatorname: '',
         orgCondtionStr: '1=1',
-        f_state:['有效'],
         model: new DataModel('rs/report/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
           f_orgid: 'this.model.f_orgid'}),
         reportStr: null,
         show: false,
-        spans: 0,
-        initres: {
-          org: [this.$login.f.orgid],
-          dep: [],
-          user: []
-        }
       }
     },
     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()
       console.log(this.$login.f)
     },
     methods: {
@@ -167,11 +173,31 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        console.log('xxxxxxxxxxx',this.orgCondtionStr)
-        let orgstr = this.f_state[0] ? "f_state in('" + this.f_state.toString().replace(new RegExp(',','g'), "','") +"') "+ this.orgCondtionStr:this.orgCondtionStr.replace('and', '')
-        this.$refs.paged.$refs.criteria.model.f_orgid = orgstr
+        let orgcondition = 'f_orgid = ' + this.f_orgid
+        if (this.f_depid[0]) {
+          orgcondition += ' and f_depid = ' + this.f_depid
+        }
+        if(this.f_operatorid[0]) {
+          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+        }
+        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         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
+      },
       // 根据文件路径获取储存的报表内容
       getFileContent (path) {
         this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -194,20 +220,6 @@
         this.show = true
         this.filename = this.data.f_report_name + this.$login.toStandardDateString()
       },
-      async getRes (condition, obj) {
-        this.orgCondtionStr = condition
-        if(obj.orgnames.length>0){
-          this.orgname = obj.orgnames[0];
-        }
-        if(obj.operatornames.length>0){
-          let users = await this.$resetpost('rs/sql/manageSingleTable',
-            {data: {tablename: 't_user', condition: ` id = '${obj.operatornames[0]}'`}},
-            {resolveMsg: null, rejectMsg: null});
-          if(users.data){
-            this.operatorname = users.data[0].name;
-          }
-        }
-      }
     },
     watch: {
       'data' (val) {
@@ -216,22 +228,9 @@
         } else {
           this.reportStr = null
         }
-      },
-      'model.data' (val) {
-        let len=0
-        let a=val.split('</tr>')
-        for(let i=0;i<a.length;i++){
-          if(a[i].split('</td>').length-1>len){
-            len=a[i].split('</td>').length-1
-          }
-        }
-        this.spans = len
       }
     },
     computed: {
-      charge_state() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
-      }
     }
   }
 </script>