apply-clients 3.5.3-3 → 3.5.3-30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.5.3-3",
+  "version": "3.5.3-30",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/apply.js

@@ -73,6 +73,7 @@ export default function (filiale) {
   Vue.component('apply-devices-management', (resolve) => { require(['./components/product/Process/Processes/devicesManagement'], resolve) })
   // 添加多个材料合并
   Vue.component('add-material-science', (resolve) => { require(['./components/product/Process/Processes/addMaterialScience'], resolve) })
+  Vue.component('return-material-science', (resolve) => { require(['./components/product/Process/Processes/ReturnMaterialScience'], resolve) })
   Vue.component('test', (resolve) => { require(['./components/product/Test'], resolve) })
 
   /** VueUtils **/
@@ -124,6 +125,10 @@ export default function (filiale) {
 
 
 
+  Vue.component('apply-material-display', (resolve) => { require(['./components/product/MaterialsManage/MaterialsList'], resolve) })
+  Vue.component('apply-material-manage', (resolve) => { require(['./components/product/MaterialsManage/MaterialsManage'], resolve) })
+  Vue.component('apply-materials-base', (resolve) => { require(['./components/product/MaterialsManage/MaterialsBase'], resolve) })
+  Vue.component('apply-map-location', (resolve) => { require(['./components/product/ApplyMap/AMapLocation'], resolve) })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
     for (let key in filialeComp) {

package/src/applyAndroid.js

@@ -46,7 +46,8 @@ export default function (filiale) {
   Vue.component('app-ignition-ventilation', (resolve) => { require(['./components/android/Ignition/VentilationIgnition'], resolve) })
   Vue.component('app-ignition-handle', (resolve) => { require(['./components/android/Ignition/VentilationIgnitionHandle'], resolve) })
   Vue.component('material-one', (resolve) => { require(['./components/android/MaterIialOne'], resolve) })
-  Vue.component('appinstallation-material', (resolve) => { require(['./components/android/AppInstallationMaterial.vue'], resolve) })
+  Vue.component('app-installation-material', (resolve) => { require(['./components/android/AppInstallationMaterial.vue'], resolve) })
+  Vue.component('app-charge-list', (resolve) => { require(['./components/android/Process/AppChargeList.vue'], resolve) })
   Vue.component('app-other-charge-list', (resolve) => { require(['./components/android/Process/AppOtherChargeList.vue'], resolve) })
   // 特殊目录给这里加
   if (filiale) {

package/src/components/android/Process/AppChargeList.vue

@@ -148,11 +148,101 @@
                 <p class="panel-title col-xs-3 text-left font">确认时间</p>
                 <p class="panel-title col-xs-9 text-left input-font">{{ row.f_confirm_date }}</p>
               </div>
+              <div class="row">
+                <button v-if="$parent.$parent.$parent.isEmpty(row.f_confirm_person)" style="background-color:#499edf;float: right"  class="btn btn-info" @click="$parent.$parent.$parent.confirmModal(row)">确认收款</button>
+              </div>
             </div>
           </div>
         </div>
       </list>
     </criteria-paged>
+    <validator name="v">
+      <modal v-if="showmodel" :show.sync="showmodel" v-ref:modal title="确认收款">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closemodel"><span>&times;</span></button>
+          <h4 class="modal-title">确认收款</h4>
+        </header>
+
+        <article slot="modal-body" class="modal-body clearfix">
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">收费金额：</label>
+            <div class="col-sm-10">
+              <input type="text"
+                     class="form-control input_view"
+                     style="width: 100%"
+                     readonly
+                     v-model="charge.f_charge_money" />
+            </div>
+          </div>
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">付款方式：</label>
+            <div class="col-sm-10">
+              <input type="text"
+                     class="form-control input_view"
+                     style="width: 100%"
+                     readonly
+                     v-model="charge.f_payment_method" />
+            </div>
+          </div>
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">金额大写：</label>
+            <div class="col-sm-10">
+              <input type="text"
+                     class="form-control input_view"
+                     style="width: 100%"
+                     readonly
+                     v-model="charge.f_amount_words" />
+            </div>
+          </div>
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">收费人员：</label>
+            <div class="col-sm-10">
+              <input type="text"
+                     class="form-control input_view"
+                     style="width: 100%"
+                     readonly
+                     v-model="charge.f_charge_collectors" />
+            </div>
+          </div>
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">确认人：</label>
+            <div class="col-sm-10">
+              <input type="text"
+                     class="form-control input_view"
+                     style="width: 100%"
+                     v-model="charge.f_confirm_person" />
+            </div>
+          </div>
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">确认时间：</label>
+            <div class="col-sm-10">
+              <datepicker id="startDate" placeholder="确认时间"
+                          style="width: 60%!important;"
+                          v-model="charge.f_confirm_date"
+                          :value.sync="charge.f_confirm_date"
+                          :default="true"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="true"
+              >
+              </datepicker>
+            </div>
+          </div>
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">备注：</label>
+            <div class="col-sm-10">
+              <input type="text"
+                     class="form-control input_view"
+                     style="width: 100%"
+                     v-model="charge.f_charge_remarks" />
+            </div>
+          </div>
+        </article>
+
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary"  :disabled='!$v.valid' @click="ConfirmPayment()">确认收款</button>
+        </footer>
+      </modal>
+    </validator>
   </div>
 </template>
 
@@ -160,7 +250,7 @@
 
 import {HttpResetClass, PagedList} from 'vue-client'
 import Vue from 'vue'
-import * as Util from "../../Util";
+
 
 export default {
   title: '报建收费明细',
@@ -168,7 +258,9 @@ export default {
     return {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getApplyCharge`,
         5, {}
-      )
+      ),
+      showmodel:false,
+      charge:{}
     }
   },
   ready () {
@@ -177,13 +269,45 @@ export default {
     this.search()
   },
   methods: {
+    isEmpty (str) {
+      return str === undefined || str === null || str.toString().trim() === ''
+    },
     search () {
       this.$refs.paged.$refs.cri.search()
     },
     async selfSearch (args) {
       args.condition = args.condition + ` and cr.f_orgid in (${Vue.user.orgid})`
       this.model.search(args.condition, args.model)
-    }
+    },
+    confirmModal(row){
+      this.charge = row
+      this.showmodel = true
+    },
+    closemodel(){
+      this.charge = {}
+      this.showmodel = false
+      this.search()
+    },
+    async ConfirmPayment() {
+      let http = new HttpResetClass()
+      let data = {
+        charge: this.charge
+      }
+      let res = await http.load('POST', this.$androidUtil.getProxyUrl() +'rs/logic/confirmCharge', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: '提交失败！！！'
+      })
+      if(res.data==200){
+        this.$showAlert('提交成功！！！', 'success', 3000)
+        //延时1s
+        setTimeout(() => {
+          this.charge = {}
+          this.showmodel = false
+        }, 1000)
+      }
+      //重新查询
+      this.search()
+    },
   }
 
 }

package/src/components/android/Process/AppOtherChargeList.vue

@@ -47,9 +47,17 @@
                 <label for="f_brand_spec" class="font text-left">收费项目：</label>
               </div>
               <div class="col-xs-8">
-                <input type="text" class="search_input input-font"
+                <v-select id="checker" :value.sync="model.f_brand_spec" class="input-font"
+                          :width="'60%'"
+                          :options='$parent.$parent.brandspecs' placeholder='收费项目'
+                          :value-single="true"
+                          condition="f_brand_spec like '%{}%'"
+                          v-model="model.f_brand_spec"
+                          close-on-select
+                          clear-button></v-select>
+<!--                <input type="text" class="search_input input-font"
                        v-model=model.f_brand_spec
-                       condition="f_brand_spec like '%{}%'">
+                       condition="f_brand_spec like '%{}%'">-->
               </div>
             </div>
             <div class="row app-row">
@@ -57,9 +65,17 @@
                 <label for="f_payment" class="font text-left">付款方式：</label>
               </div>
               <div class="col-xs-8">
-                <input type="text" class="search_input input-font"
+                <v-select id="checker" :value.sync="model.f_payment" class="input-font"
+                          :width="'60%'"
+                          :options='$parent.$parent.payments' placeholder='付款方式'
+                          :value-single="true"
+                          condition="f_payment like '%{}%'"
+                          v-model="model.f_payment"
+                          close-on-select
+                          clear-button></v-select>
+<!--                <input type="text" class="search_input input-font"
                        v-model=model.f_payment
-                       condition="f_payment like '%{}%'">
+                       condition="f_payment like '%{}%'">-->
               </div>
             </div>
             <div class="row app-row">
@@ -72,7 +88,7 @@
                           :options='$parent.$parent.states' placeholder='收费状态'
                           :value-single="true"
                           condition="f_state ='{}'"
-                          v-model="model.f_order_man"
+                          v-model="model.f_state"
                           close-on-select
                           clear-button></v-select>
               </div>
@@ -116,6 +132,14 @@
                        condition="f_operator = '{}'">
               </div>
             </div>
+            <div class="row app-row" >
+              <div class="col-xs-6" style="text-align: center">
+                <span class="font text-left">合计户数:{{$parent.model.count}}</span>
+              </div>
+              <div class="col-xs-6" style="text-align: center">
+                <span class="font text-left">合计金额:{{$parent.model.sums.f_money}}</span>
+              </div>
+            </div>
             <div class="row text-center app-row" >
               <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="search()">查询</button>
             </div>
@@ -200,9 +224,11 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/applyotherChargeQuery`,
         10, {
             orderitem: '`f_operate_date DESC`'
-        }
+        },{f_money:''}
       ),
-      states:[{'label':'有效','value':'有效'},{'label':'无效','value':'无效'}]
+      states:[{'label':'全部','value':''},{'label':'有效','value':'有效'},{'label':'无效','value':'无效'},{'label':'冲正','value':'冲正'},{'label':'撤销','value':'撤销'}],
+      payments:this.$appdata.getParam('付款方式查询')?[{label:'全部',value:''}, ...this.$appdata.getParam('付款方式查询')]:[{label:'全部',value:''}],
+      brandspecs:this.$appdata.getParam('其他收费类型')?[{label:'全部',value:''}, ...this.$appdata.getParam('其他收费类型')]:[{label:'全部',value:''}]
     }
   },
   ready () {
@@ -212,8 +238,8 @@ export default {
   },
   methods: {
     async selfSearch (args) {
-      args.condition = args.condition + ` and  f_orgid = '${Vue.user.orgid}' and f_state = '有效'`
-      this.model.search(args.condition, args.model)
+      args.condition = args.condition + ` and  f_orgid = '${Vue.user.orgid}'`
+      this.model.search(args.condition, args.model,args.condValueStr)
     }
   }
 

package/src/components/android/Process/Processes/chargesList.vue

@@ -60,7 +60,7 @@
         <h4 class="modal-title">添加材料</h4>
       </header>
       <article slot="modal-body" class="modal-body clearfix">
-        <appinstallation-material v-if="changeModel" :selectdata = "selectdata" @valueChange="change" @aftersave="aftersave()"></appinstallation-material>
+        <app-installation-material v-if="changeModel" :selectdata = "selectdata" @valueChange="change" @aftersave="aftersave()"></app-installation-material>
       </article>
       <footer slot="modal-footer" class="modal-footer">