manage-client 3.2.80 → 3.2.81

package/package.json

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

package/src/components/SellReport/ReportComponrnt/TieAnAccount.vue

@@ -103,40 +103,36 @@
       <validator name='v'>
         <form class="form-horizontal  select-overspread">
           <div class="row">
-            <div v-for="(key, value) in org" v-if ="value.trim()!=''" class="col-sm-6 form-group">
-              <label class="font_normal_body">{{ key == 'f_orgname' ? '公司' : key == 'f_depname' ? '部门' : '人员' }}</label>
+            <div v-for="(key, value) in org" v-if ="value.trim()!=''" class="col-sm-4 form-group">
+              <label class="font_normal_body">{{ key == 'f_orgname' ? '&emsp;&emsp;&emsp;&emsp;公司' : key == 'f_depname' ? '&emsp;&emsp;&emsp;&emsp;部门' : '&emsp;&emsp;&emsp;&emsp;人员' }}</label>
               <input type="text" style="width:60%" class="input_search" :value="value"
                      disabled="disabled">
             </div>
           </div>
           <div class="row">
             <div class="col-sm-4 form-group" v-for="item in affirmDate">
-              <label class="col-sm-6 font_normal_body">{{item.name}}</label>
+              <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;{{item.name}}</label>
               <input type="text" style="width:60%" class="input_search" :value="item.val"
                      disabled="disabled">
             </div>
-          </div>
-          <div class="row">
             <div class="col-sm-4 form-group" >
-              <label class="col-sm-6 font_normal_body" for="startDate">上次扎帐日期</label>
+              <label class="font_normal_body" for="startDate">上次扎帐日期</label>
               <datepicker id="startDate" placeholder="上次扎帐日期" style="width: 60%"
                           v-model="startDate"
                           :value.sync="startDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :disabled="true"
                           :show-reset-button="reset">
               </datepicker>
             </div>
-          </div>
-          <div class="row" >
             <div class="col-sm-4 form-group" >
-              <label class="col-sm-6 font_normal_body" for="endDate">本次扎帐日期</label>
+              <label class="font_normal_body" for="endDate">本次扎帐日期</label>
               <datepicker id="endDate" placeholder="本次扎帐日期" style="width: 60%"
                           v-model="endDate"
-                          :value.sync="endDate.substring(0,10)"
+                          :value.sync="endDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :disabled="true"
                           :show-reset-button="reset">
               </datepicker>
@@ -144,26 +140,23 @@
           </div>
           <div class="row">
             <div class="col-sm-4 form-group" >
-              <label class="col-sm-6 font_normal_body">&emsp;系统总金额</label>
+              <label class="font_normal_body">&emsp;系统总金额</label>
               <input type="text" style="width:60%" class="input_search" v-model="reportstr"
                      disabled="disabled" placeholder="系统金额">
             </div>
-          </div>
-          <div class="row">
             <div class="col-sm-4 form-group" >
-              <label class="col-sm-6 font_normal_body">&emsp;扎帐总金额</label>
+              <label class="font_normal_body">&emsp;扎帐总金额</label>
               <input type="text" style="width:60%" class="input_search" v-model="f_fee"
                      placeholder="扎帐金额">
             </div>
-          </div><br>
+          </div>
           <div class="row">
             <div class="col-sm-11 form-group">
-              <label class="col-sm-2 font_normal_body"><nobr>&emsp;&emsp;&emsp;&emsp;备注</nobr></label>
-              <textarea style="resize:none;width:60%;height: 70px;" class="input_search"
+              <label class="font_normal_body"><nobr>&emsp;&emsp;&emsp;&emsp;备注</nobr></label>
+              <textarea style="resize:none;width:95%;" class="input_search"
                         v-model='f_remarks' ></textarea>
             </div>
           </div>
-
         </form>
       </validator>
     </article>
@@ -275,6 +268,9 @@ export default {
       let querys= await this.$resetpost('rs/sql/PrickBillQuery?pageNo=1&pageSize=7',
           {data:{condition:condition}},{resolveMsg:null,rejectMsg:'查询出错'})
       this.models.rows = querys.data
+      if (querys.data.length === 0){
+        this.$dispatch('update', '')
+      }
     },
     history() {
       this.isHistory = !this.isHistory
@@ -293,7 +289,9 @@ export default {
         {data:data},
         {resolveMsg:null,rejectMsg:null}).then(res =>{
         switch (res.data) {
-          case 200 : this.$showAlert('撤销成功', 'success', 3000)
+          case 200 :
+              this.$showAlert('撤销成功', 'success', 3000)
+              this.getStartDate()
               this.isHistory = !this.isHistory
             break
           case 201 : this.$showAlert('撤销失败', 'warning', 3000)
@@ -345,6 +343,7 @@ export default {
       }
       // 本部门只能扎本部门的
       if (this.config.isDepname && this.f_depname !== this.org.f_depname) {
+        console.log('本公司只能扎本部门的', this.config.isDepname, this.f_depname, this.org.f_depname[0])
         this.$showAlert('禁止跨部门扎帐', 'warning', 4000)
         return
       }
@@ -376,21 +375,18 @@ export default {
       let rep = this.rep
       let moneys = val.toString().match(regex)
       let titles = val.toString().match(this.titRegex)
-      console.log('---titles---|||||||', titles)
       if (titles && titles.length > 0) {
         for (let i = 0; i < titles.length; i++) {
           let name = titles[i].toString().replace(rep, '').trim()
           let value = moneys[i].toString().replace(rep, '').trim()
           item.push({name: name, val: value})
         }
-        console.log('=======itme==========>>>>>>>', item)
       }
       this.tieData = item
     },
     sumMoney (obj, conf) {
       this.affirmDate = obj.filter(x => conf.includes(x.name))
       let option = obj.filter(x => conf.includes(x.name)).map(x => parseFloat(x.val)).reduce((x, y) => x + y, 0)
-      console.log('>>>>', option)
       return option.toFixed(2)
     },
 
@@ -430,12 +426,13 @@ export default {
         }
         info.saveData.push(xx)
       }
-      console.log('xxzz', info)
       let HttpReset = new HttpResetClass()
       HttpReset.load('POST', 'rs/logic/SaveTieAnAccount', info,
         {resolveMsg: null, rejectMsg: null}).then((res) => {
         switch (res.data) {
-          case 200 : this.$showAlert('保存成功', 'success', 3000)
+          case 200 :
+            this.$showAlert('保存成功', 'success', 3000)
+            this.getStartDate()
             break
           case 201 : this.$showAlert('重复扎帐', 'warning', 3000)
             break
@@ -484,7 +481,9 @@ export default {
     },
     'models.rows' (val) {
       if (val && val.length > 0) {
-        this.startDate = val.map(x => x.f_end_date.substring(0,10))[0].toString() // 获取 上次扎帐时间
+        this.startDate = val.map(x => x.f_end_date)[0].toString() // 获取 上次扎帐时间
+        console.log('opopopopopo:', this.startDate)
+        this.$dispatch('update', this.startDate)
       }
     }
   },

package/src/components/SellReport/SellDepReport.vue

@@ -6,17 +6,18 @@
         <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" >
+            <div class="col-sm-2" >
               <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">
+                          :show-reset-button="reset"
+                          :disabled="$parent.$parent.noshow">
               </datepicker>
             </div>
-            <div class="col-sm-4" >
+            <div class="col-sm-2" >
               <label  class="font_normal_body" for="endDate">结束日期:</label>
               <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
                           v-model="model.endDate"
@@ -26,34 +27,21 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-4 form-group" >
-              <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
-              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
-            </div>
-            <div class="col-sm-4 form-group">
-              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
-              <res-select id="dep" restype='department' style="width: 60%"
-                          is-mul="false"
-                          @res-select="$parent.$parent.getdep"
-                          :parentresid="$parent.$parent.depresid"
-                          :initresid='$parent.$parent.depid' >
-              </res-select>
-
-            </div>
-            <div class="col-sm-4 form-group">
-              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
-              <res-select id="oper" restype='user' style="width: 60%"
-                          is-mul="false"
-                          @res-select="$parent.$parent.getuser"
-                          :parentresid="$parent.$parent.userresid"
-                          :initresid='$parent.$parent.operatorid'>
-              </res-select>
+            <div class="col-sm-2">
+              <label class="font_normal_body" title="参数:付款方式查询">付款方式:</label>
+              <v-select :value.sync="model.f_payment" multiple
+                        v-model="model.f_payment"
+                        :options='$parent.$parent.payment' placeholder='请选择'
+                        condition="f_payment in {}"
+                        close-on-select></v-select>
             </div>
+            <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
           </div>
           <div class="span" style = "float:right;">
             <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
             <tie-an-account v-if="this.$login.r.includes('报表扎帐')"
                             :org="$parent.$parent.org"
+                            @update="$parent.$parent.update"
                             :model="$parent.$parent.data"
                             :fee-str="$parent.model.data"
                             :end-date="model.endDate" ></tie-an-account>
@@ -161,6 +149,7 @@
           f_operator: ''
         },
         tablen:0,
+        noshow: false,
         datas: '',
         orgname: '',
         depname: '',
@@ -169,12 +158,19 @@
         model: new DataModel('rs/report/sellDepReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
           f_orgid: 'this.model.f_orgid'}),
         reportStr: null,
+        resshow:['company','department','operator'],
         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.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardTimeString()
       console.log(this.$login.f)
     },
     methods: {
@@ -182,30 +178,34 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
-
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
-        if (this.f_orgid[0]) {
-          orgcondition += ' and 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
+        let orgstr = this.orgCondtionStr
+        this.org.f_depname = this.depname
+        this.org.f_operator = this.operatorname
+        orgcondition = orgcondition + orgstr
+        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + ' and ' + this.$refs.paged.$refs.criteria.condition
         this.$refs.paged.search(args)
       },
-      getRes (obj) {
-        this.org.f_orgname = this.orgname = obj.res[0]
-        this.depresid = obj.resids
-        this.userresid = obj.resids
-        this.f_orgid = obj.resids
+      update (val) {
+        if (val !== ''){
+          this.$refs.paged.$refs.criteria.model.startDate = val
+          this.noshow = true
+        } else {
+          this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+          this.noshow = false
+        }
+      },
+      getRes (condition, obj) {
+        this.orgCondtionStr = condition
+        this.org.f_orgname = obj.orgnames[0]
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+        this.operatorname = obj.operatornames[0]
       },
       getdep (obj, val) {
         this.org.f_depname = this.depname = val[0]
-        // this.userresid = obj
+        this.userresid = obj
         this.f_depid = obj
       },
       getuser ( obj, val) {
@@ -256,6 +256,9 @@
       }
     },
     computed: {
+      payment() {
+        return [...this.$appdata.getParam('付款方式查询')]
+      }
     }
   }
 </script>

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

@@ -84,6 +84,9 @@
     <tabs header="操作员日结列表" v-if="permission('操作员日结列表')">
       <proceeds-oper v-if="show.includes('操作员日结列表')"  @deal-msg="dealMsg"></proceeds-oper>
     </tabs>
+    <tabs header="未抄表用户报表" v-if="permission('未抄表用户报表')">
+      <unhand-business @deal-msg="dealMsg"></unhand-business>
+    </tabs>
   </tab-button>
 
 </template>