manage-client 3.2.80 → 3.2.83-1

package/build/dev-server.js

@@ -11,13 +11,13 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan='http://183.67.41.139:8400'
-var qtx='http://183.67.41.139:8400'
-var bendi = 'http://183.67.41.139:8400'
+var shaoguan='http://119.146.1.106:8300/'
+var qtx='http://36.103.222.144:6300/'
+var bendi = 'http://127.0.0.1:8090'
 // var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://183.67.41.139:8400'
+var fuwu = 'http://192.168.50.4:8400'
 // var fuwu = 'http://172.168.1.11:9001'
-var system = 'http://183.67.41.139:8400'
+var system = 'http://192.168.50.4:8400'
 //192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -78,7 +78,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/logic/SumSettleFileImport': {
-    target: 'http://183.67.41.139:8400'
+    target: 'http://127.0.0.1:8080'
   },
   '/rs': {
     target: bendi

package/package.json

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

package/src/components/SellReport/NonResidentGas.vue

@@ -24,6 +24,14 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+          <div class="col-sm-2">
+            <label class="font_normal_body" title="参数:气表类型查询">气表类型:</label>
+            <v-select :value.sync="model.f_meter_type" multiple
+                      v-model="model.f_meter_type"
+                      :options='$parent.$parent.metertype' placeholder='请选择'
+                      condition="f_meter_classify in {}"
+                      close-on-select></v-select>
+          </div>
             <div class="col-sm-2">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
               <right-tree @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
@@ -162,6 +170,8 @@
         if(this.f_operatorid && this.f_operatorid[0]) {
           orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
+        console.log('111111',args)
+        orgcondition = orgcondition + ' and ' +args.condition
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)
       },
@@ -193,6 +203,9 @@
       }
     },
     computed: {
+      metertype() {
+        return [...this.$appdata.getParam('气表类型查询')]
+      }
     }
   }
 </script>

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>
@@ -259,8 +252,6 @@ export default {
   methods: {
     async getStartDate () {
       // 获取上次扎帐日期
-      console.log(typeof this.f_orgid, this.f_orgid)
-      console.log(typeof this.f_depid, this.f_depid)
       let condition = `f_report_path='${this.model.f_report_path}' and f_state = '有效'`
       if (this.config.isOrgname) {
         condition += ' and f_orgid = ' + this.f_orgid
@@ -275,6 +266,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
@@ -284,19 +278,30 @@ export default {
       console.log('撤销信息', val)
       let data = {
         flag: 2,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps,
+        f_operatorid: this.$login.f.id,
+        f_operator: this.$login.f.name,
         data: {
           id: val.id,
           f_state: '无效'
         }
       }
+      if(this.$login.r.includes('扎帐撤销权限')) {
+        data.flag = 3
+      }
       this.$resetpost('rs/logic/SaveTieAnAccount',
         {data:data},
         {resolveMsg:null,rejectMsg:null}).then(res =>{
         switch (res.data) {
-          case 200 : this.$showAlert('撤销成功', 'success', 3000)
+          case 202 :
+              this.$showAlert('撤销成功', 'success', 3000)
+              this.getStartDate()
               this.isHistory = !this.isHistory
             break
-          case 201 : this.$showAlert('撤销失败', 'warning', 3000)
+          case 201 : this.$showAlert('撤销失败,该条记录不是当天扎帐记录，不能撤销！', 'warning', 3000)
             break
         }
       })
@@ -345,6 +350,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 +382,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 +433,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 +488,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)
       }
     }
   },