apply-clients 5.0.35-99 → 5.0.35-ezhou-2

package/src/components/product/Process/Processes/Service/ApplyChargeSearch.vue

@@ -103,25 +103,6 @@
                 </div>
                 </div>
 
-              <div class="form-group col-sm-2">
-                <label class="col-sm-4 control-label linehhh">报装类型</label>
-                <div class="col-sm-8">
-                  <v-select :value.sync="model.f_work_type" v-model="model.f_work_type"
-                            :options='$parent.$parent.worktype'  width="100%"
-                            close-on-select condition="a.f_work_type = '{}'">
-                  </v-select>
-                </div>
-              </div>
-
-              <div class="form-group col-sm-2">
-                <label class="col-sm-4 control-label linehhh">用户类型</label>
-                <div class="col-sm-8">
-                  <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
-                            :options='$parent.$parent.usertype'  width="100%"
-                            close-on-select condition="a.f_user_type = '{}'">
-                  </v-select>
-                </div>
-              </div>
 
               <div class="form-group">
                 <button class="btn btn-primary" @click="search(),$parent.$parent.showpager()">
@@ -149,14 +130,14 @@
                 <th><nobr>总应缴金额</nobr></th>
                 <th><nobr>已交金额</nobr></th>
                 <th><nobr>未交金额</nobr></th>
-                <th><nobr>操作</nobr></th>
+<!--                <th><nobr>发票冲正</nobr></th>-->
               </tr>
             </template>
             <template partial='body'>
               <td style="text-align: center;">{{$index+1}}</td>
               <td style="text-align: center;">{{row.f_charge_money}}</td>
-              <td style="text-align: center;">{{row.f_user_name}}</td>
-              <td style="text-align: center;">{{row.f_address}}</td>
+              <td style="text-align: center;">{{row.f_charge_user}}</td>
+              <td style="text-align: center;">{{row.f_charge_address}}</td>
 <!--              <td style="text-align: center;">{{// row.f_charge_item}}</td>-->
               <td style="text-align: center;">{{row.f_charge_collectors}}</td>
               <td style="text-align: center;">{{row.f_charging_status}}</td>
@@ -170,9 +151,7 @@
               <td style="text-align: center;">{{row.f_total_cost}}</td>
               <td style="text-align: center;">{{row.app_f_cumulative_money}}</td>
               <td style="text-align: center;">{{row.f_unaccounts_money}}</td>
-              <td style="text-align: center;">
-                <button class="btn-primary btn btn-sm" @click.prevent="$parent.$parent.$parent.update_way(row)">修改</button>
-              </td>
+<!--              <td style="text-align: center;">{{row.f_is_correct}}</td>-->
             </template>
           </data-grid>
         </criteria-paged>
@@ -180,45 +159,19 @@
       <div  class="flex" style="height: 10%">
         <div novalidate class="form-inline auto" partial>
           <p class="bg-info text-center" style="padding: 8px;font-size: 20px">合计收费记录共
-            <span style="color: red">{{modeluse.rows.length}}</span>笔，
-            收款金额合计<span style="color: red">{{price.rows[0].f_charge_money}}</span>元，
-            <!--合计应缴总金额<span style="color: red">{{price.rows[0].f_total_cost}}</span>元，
-            已缴<span style="color: red">{{price.rows[0].f_cumulative_money}}</span>元，未缴<span  style="color: red">{{price.rows[0].f_unaccounts_money}}</span>元-->
+            <span style="color: red">{{modeluse.rows.length}}</span>笔，合计金额<span style="color: red">{{price.rows[0].f_charge_money}}</span>元
           </p>
         </div>
       </div>
     </div>
-    <!--修改弹出框-->
-    <modal :show.sync="updateControl" v-ref:modal backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeUpdate()"><span>&times;</span></button>
-        <h4 class="modal-title">修改</h4>
-      </header>
-      <article slot="modal-body" class="modal-body" >
-        <div class="from-group"  style="width: 100%">
-          <label  style="width: 15%;float: left">票据类型</label>
-          <v-select :value.sync="selectItem.f_bill_style" v-model="selectItem.f_bill_style"
-                    :options='billstyle' placeholder='请选择' style="width: 80%;float: left"
-                    close-on-select >
-          </v-select>
-        </div>
-      </article>
-
 
-      <footer slot="modal-footer" class="modal-footer">
-        <div class="from-group" style="width: 100%;float: left">
-          <button v-show="updateControl" type="button" class="btn btn-default" @click='closeUpdate'>取消</button>
-          <button v-show="updateControl" type="button" class="btn btn-success" @click='confirm'>确认</button>
-        </div>
-      </footer>
-    </modal>
   </div>
 </template>
 <script>
   import * as Util from '../../../../Util'
 
   import { PagedList } from 'vue-client'
-  import {HttpResetClass} from 'vue-client'
+
   Date.prototype.Format = function (fmt) {
     var o = {
       "M+": this.getMonth() + 1, //月份
@@ -243,99 +196,57 @@
         filialeNameStr: null,
         filialeCodeStr: this.$login.f.f_orgids,
         userid: this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        source:`tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
        // f_operate_start_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
        // f_operate_end_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
-        model: new PagedList('rs/sql/getApplyCharge', 30, {orderitem: '`id`'}),
-        modeluse: new PagedList('rs/sql/getApplyCharge', 999999, {orderitem: '`id`'}),
-        price: new PagedList('rs/sql/getChargeAll', 999999, {orderitem: '`f_charge_money`'}),
-        human: [],
-        filiale: [],
-        method: this.$appdata.getParam('付款方式'),
-        usertype:[
-          {label: '民用', value: '民用'},
-          {label: '非民用', value: '非民用'}
-        ],
-        worktype:[
-          {label: '新报装', value: '新报装'},
-          {label: '改管', value: '改管'}
-        ],
-        correct: [
+        model: new PagedList('rs/sql/getApplyCharge', 30, { orderitem: '`id`'}),
+        modeluse: new PagedList('rs/sql/getApplyCharge', 999999, { orderitem: '`id`'}),
+        price: new PagedList('rs/sql/getChargeAll', 999999, { orderitem: '`f_charge_money`'}),
+        human:[],
+        filiale:[],
+        method:[],
+        correct:[
           {label: '是', value: '是'},
-          {label: '否', value: '否'}
+          {label:'否', value: '否'}
         ],
-        state: [
+        state:[
           {label: '有效', value: '有效'},
-          {label: '无效', value: '无效'}
-        ],
-        selectItem: {},
-        billstyle: this.$appdata.getParam('发票类型'),
-        updateControl: false,
-        billID: 0
+          {label:'无效', value: '无效'}
+        ]
       }
     },
     ready () {
-      this.$refs.paged.$refs.criteria.model.f_operate_start_date = Util.toStandardDateString() + ' 00:00:00'
-      this.$refs.paged.$refs.criteria.model.f_operate_end_date = Util.toStandardDateString() + ' 23:59:59'
+      this.$refs.cp.$refs.cri.model.f_operate_start_date = Util.toStandardDateString() + ' 00:00:00'
+      this.$refs.cp.$refs.cri.model.f_operate_end_date = Util.toStandardDateString() + ' 23:59:59'
       this.search()
       this.gethuman()
     },
     methods: {
-      clear () {
-        this.$refs.paged.$refs.criteria.model = {}
+      clear(){
+        this.$refs.cp.$refs.cri.model = {}
       },
-      getRes (obj) {
+      getRes(obj) {
         this.filialeNameStr = obj.res
         this.filialeCodeStr = obj.resids
         console.log(this.filialeNameStr)
         console.log(this.filialeCodeStr)
       },
-      showpager () {
+      showpager() {
         // this.$refs.cp.pager = true
         this.$dispatch('hiddenbtn')
       },
-       search () {
-         let condition = "1=1 and r.f_filiale like '%" + this.$login.f.f_fengongsi + "%'"
-        //  debugger
-        // let condition =  args.condition
-      debugger
+      search () {
+        let condition = "1=1 and r.f_filiale like '%"+this.$login.f.f_fengongsi+"%'"
         this.model.search(condition)
         this.modeluse.search(condition)
-        let condition1 = condition
-        this.price.search(condition1)
-      },
-      update_way (row) {
-        console.log('进入修改方法')
-        this.selectItem = {}
-        this.billID = row.id
-        this.updateControl = true
-      },
-      closeUpdate () {
-        this.updateControl = false
-      },
-      confirm () {
-        let data = {
-          f_bill_style: this.selectItem.f_bill_style[0],
-          id: this.billID
-        }
-        console.log('数据：' + JSON.stringify(this.selectItem))
-        this.$resetpost('rs/entity/t_charge_record', data).then((res) => {
-          console.log('返回值：' + JSON.stringify(res.data))
-          if (res.data.id > 0) {
-            // this.$showMessage('修改成功!')
-            this.closeUpdate()
-            this.search()
-          }
-        })
+        this.price.search(condition)
       },
-      selfSearch (args) {
-        args.condition = args.condition + ` and a.f_filialeids like '%${this.filialeCodeStr}%'`
-        console.log('condition:', args.condition)
+
+      selfSearch(args) {
+        args.condition = args.condition + ` and tbd.f_orgstr like '%${this.filialeCodeStr}%'`
         this.model.search(args.condition, args.model)
-        this.modeluse.search(args.condition, args.model)
-        this.price.search(args.condition, args.model)
       },
-      cleaner () {
+      cleaner() {
         Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
           this.$refs.paged.$refs.criteria.model[key] = ''
         })
@@ -345,19 +256,19 @@
         this.modeluse.search(this.$refs.paged.$refs.criteria.condition)
         this.price.search(this.$refs.paged.$refs.criteria.condition)
       },
-      gethuman () {
+      gethuman(){
         console.log('获取人员')
         this.$resetpost('rs/logic/getChargeList', {data: {condition: `1=1`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           // this.params.rows.splice(index, 1)
-          console.log('获取成功', res)
+          console.log('获取成功',res)
           let house = []
-          for (let row of res.data.human) {
-            house.push({label: row.f_charge_collectors, value: row.f_charge_collectors})
+          for (let row of res.data.human){
+            house.push({label: row.f_charge_collectors,value: row.f_charge_collectors})
           }
           this.human = house
           let house2 = []
           for (let row of res.data.f){
-            house2.push({label: row.r.f_filiale,value: row.r.f_filiale})
+            house2.push({label: row.f_filiale,value: row.f_filiale})
           }
           this.filiale = house2
           let house3 = []
@@ -366,7 +277,9 @@
           }
           this.method = house3
         })
-      }
+
+      },
+
     },
     computed: {
 

package/src/components/product/Process/Processes/Service/PaperTicketBill.vue

@@ -8,7 +8,7 @@
 
         <validator name='v'>
           <form class="form-horizontal  select-overspread">
-            <div class="row" style="display: flex;justify-content: center;" id='normal-bill2' >
+            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' >
               <div  class="form-group col-sm-6">
                 <label class=" col-sm-2 control-label">发票代码:</label>
                 <input  type="text" class="form-control" v-model="model.f_bill_code" style="width:60%"