apply-clients 3.5.5-96 → 3.5.5-98

package/build/dev-server.js

@@ -8,8 +8,8 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://113.219.4.57:31467'
-var applyinstall = 'http://113.219.4.57:31467'
+var ldap = 'http://61.163.123.47:31785'
+var applyinstall = 'http://61.163.123.47:31785'
 
 var proxyTable = {
   '/api': {

package/package.json

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

package/src/filiale/fugou/pc/ApplyChargeList.vue

@@ -236,6 +236,7 @@
             <th style="white-space: nowrap;">收费日期(退款日期)</th>
             <th style="white-space: nowrap;">实际收费时间</th>
             <th style="white-space: nowrap;">状态</th>
+            <th style="white-space: nowrap;" v-if="$parent.$parent.$parent.showbutton">操作</th>
           </tr>
         </template>
         <template partial='body'>
@@ -303,10 +304,53 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_status}}</font></nobr>
             </td>
+            <td style="text-align: center;"  v-if="$parent.$parent.$parent.showbutton">
+              <nobr>
+                <button
+                  type="button" name="button" class="btn btn-link"
+                  @click="$parent.$parent.$parent.ChangeRecods(row)">修改</button>
+              </nobr>
+            </td>
           </tr>
         </template>
       </data-grid>
     </criteria-paged>
+  <validator name="v">
+    <modal v-if="showCharge" :show.sync="showCharge" v-ref:modal :large="true" :backdrop="false" title="收费明细">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal"><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" v-show="false" v-model="records.f_payment_term" v-validate:f_payment_term = "['required']" >
+            <input-select width="100%"  class="select select_list" placeholder='请选择'
+                          v-model="records.f_payment_term"
+                          :value.sync="records.f_payment_term"
+                          :options='paymentTerm'
+                          :value-single="true"
+                          close-on-select ></input-select>
+          </div>
+        </div>
+        <div class="form-group col-sm-12" >
+          <label class="col-sm-2 control-label">状态：</label>
+          <div class="col-sm-10">
+            <input-select width="100%"  class="select select_list" placeholder='请选择'
+                          v-model="records.f_charge_status"
+                          :value.sync="records.f_charge_status"
+                          :options='chargeStatus'
+                          :value-single="true"
+                          close-on-select ></input-select>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary"  @click="saveCharge()">确认</button>
+      </footer>
+    </modal>
+  </validator>
 </template>
 
 <script>
@@ -359,7 +403,10 @@ export default {
         'f_actual_date': '实际收费时间',
         'f_charge_status': '状态',
         'f_payment_term': '收费项目'
-      }
+      },
+      records:{},
+      showbutton:false,
+      showCharge:false
     }
   },
   ready () {
@@ -370,8 +417,27 @@ export default {
     this.search()
     this.getservicer()
     this.getapplyoperator()
+    if( this.$login.f.rolestr.includes("收费明细修改")){
+      this.showbutton=true
+    }
 },
   methods: {
+    ChangeRecods(row){
+      this.records = row
+      this.showCharge= true
+    },
+    closeModal(){
+      this.records = {}
+      this.showCharge= false
+    },
+    saveCharge(){
+      let sql = `update t_charge_record set f_payment_term= '${this.records.f_payment_term}' ,f_charge_status='${this.records.f_charge_status}' where id= '${this.records.id}'`
+      let http = new HttpResetClass()
+      http.load('post','/rs/logic/runSQL', {data: {sql: sql}},{rejectMsg:null,resolveMsg:'修改成功！！'}).then(res=>{
+        this.records = {}
+        this.showCharge= false
+      })
+    },
    async getservicer(){
       let data = {
         tablename: 't_user',

package/src/filiale/jinhuang/android/AppServiceControl.vue

@@ -1474,8 +1474,9 @@ export default {
       if(this.show_data.fields[index].label === '是否老居民首次开发'){
         if( this.getLableValue('是否老居民首次开发')==='是'){
           this.showLabels('开户比例')
+          this.hideLabels('立管架空')
           this.setLabelValue("立管架空", '')
-        }else{
+        }else if(this.getLableValue('是否老居民首次开发')==='否'){
           this.showLabels('立管架空')
           this.hideLabels('开户比例')
           this.setLabelValue("开户比例", '')

package/src/filiale/jinhuang/pc/ServiceControl.vue

@@ -1890,8 +1890,9 @@
         if(this.show_data.fields[index].label === '是否老居民首次开发'){
           if( this.getLableValue('是否老居民首次开发')==='是'){
             this.showLabels('开户比例')
+            this.hideLabels('立管架空')
             this.setLabelValue("立管架空", '')
-          }else{
+          }else if(this.getLableValue('是否老居民首次开发')==='否'){
             this.showLabels('立管架空')
             this.hideLabels('开户比例')
             this.setLabelValue("开户比例", '')

package/src/filiale/jinhuang/pc/SupervisoryList.vue

@@ -263,8 +263,9 @@
             <th style="white-space: nowrap;">施工单位</th>
             <th style="white-space: nowrap;">施工时间</th>
             <th style="white-space: nowrap;">缴费金额</th>
-            <th style="white-space: nowrap;">领用人</th>
-            <th style="white-space: nowrap;">发货人</th>
+            <th style="white-space: nowrap;">是否老居民首次开发</th>
+            <th style="white-space: nowrap;">立管架空</th>
+            <th style="white-space: nowrap;">开户比例</th>
             <th style="white-space: nowrap;">发起人</th>
           </tr>
         </template>
@@ -322,10 +323,13 @@
               <nobr>{{row.f_cumulative_payment_money}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.lyr}}</nobr>
+              <nobr>{{row.f_first_user}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.fyr}}</nobr>
+              <nobr>{{row.f_igniter_pipe}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_igniter_account}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_operator}}</nobr>

package/src/main.js

@@ -9,7 +9,7 @@ import {material} from 'material-client'
 import apply from './apply'
 
 all()
-apply('jinhuang')
+apply('fugou')
 ldap()
 sale()
 material()