apply-clients 3.4.98-1 → 3.4.98-2

package/package.json

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

package/src/filiale/yangchunboneng/pc/InstallInfoSelect.vue

@@ -143,6 +143,7 @@
       <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid class="list_area table_sy">
         <template partial='head'>
           <tr class="title">
+            <th style="white-space: nowrap;">操作</th>
             <th style="white-space: nowrap;">序号</th>
             <th style="white-space: nowrap;">工程编号</th>
             <th style="white-space: nowrap;">客户名称</th>
@@ -156,11 +157,22 @@
             <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>
         <template partial='body'>
           <tr>
+            <td style="text-align: center;">
+              <dropdown>
+                <button @click="$parent.$parent.$parent.checkfuncs(row)" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
+                </button>
+                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+                  <li v-for="(index,func) in $parent.$parent.$parent.funcs" v-if="$parent.$parent.$parent.$parent.showFunc(func.personexpression)">
+                    <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
             <td style="text-align: center;">
               <nobr>{{$index+1}}</nobr>
             </td>
@@ -200,18 +212,7 @@
             <td style="text-align: center;">
               <nobr>{{row.confirmtotal}}</nobr>
             </td>
-            <td style="text-align: center;">
-              <dropdown>
-                <button @click="$parent.$parent.$parent.checkfuncs(row)" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
-                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
-                </button>
-                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-                  <li v-for="(index,func) in $parent.$parent.$parent.funcs" v-if="$parent.$parent.$parent.$parent.showFunc(func.personexpression)">
-                    <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
-                  </li>
-                </ul>
-              </dropdown>
-            </td>
+
           </tr>
         </template>
       </data-grid>

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

@@ -562,8 +562,8 @@
           {resolveMsg: null, rejectMsg: '查询失败！！！'}
         )
         for (let i =0;i<res1.data.length;i++){
-          if (isEmpty(res1.data[i].f_confirm_person)  || isEmpty(res1.data[i].f_auditor_person)){
-            this.$showAlert(`当前${defname}环节,费用未收费确认和审核，请仔细检查并点击保存`, 'warning', 3000)
+          if (isEmpty(res1.data[i].f_confirm_person)){
+            this.$showAlert(`当前${defname}环节,费用未收费确认，请仔细检查并点击保存`, 'warning', 3000)
             throw null
           }
         }
@@ -1615,7 +1615,7 @@
             // let f_room_suffix = f_room ? this.config.f_room_suffix : ''
             let f_room_suffix = f_room ? '室' : ''
 
-            let f_address = f_pcd + f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
+            let f_address =  f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
             this.setLabelValue("地址", f_address)
           }
         }

package/src/filiale/yangchunboneng/pc/chargeManagement.vue

@@ -113,7 +113,7 @@
                 @click="$parent.$parent.showConfirmModal(row,'确认收款')"
               >确认收款</button>
           </nobr>
-            <nobr v-if="row.f_charge_status !== '退款'&& row.f_charge_status !== '作废' && row.f_confirm_person!=null&& row.f_auditor_person==null">
+<!--            <nobr v-if="row.f_charge_status !== '退款'&& row.f_charge_status !== '作废' && row.f_confirm_person!=null&& row.f_auditor_person==null">
               <button
                 type="button"
                 name="button"
@@ -121,7 +121,7 @@
                 :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
                 @click="$parent.$parent.showConfirmModal(row,'确认审核')"
               >确认审核</button>
-            </nobr>
+            </nobr>-->
             <nobr v-if="row.f_charge_status !== '退款'">
               <button
                 type="button"
@@ -520,7 +520,7 @@
         <button type="button" class="btn btn-primary"  @click="ConfirmPayment()">确认收款</button>
       </footer>
     </modal>
-    <modal v-if="showauditor" :show.sync="showauditor" v-ref:modal :backdrop="false" title="确认审核">
+<!--    <modal v-if="showauditor" :show.sync="showauditor" v-ref:modal :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>
@@ -637,7 +637,7 @@
       <footer slot="modal-footer" class="modal-footer">
         <button type="button" class="btn btn-primary"  @click="ConfirmPayment()">确认收款</button>
       </footer>
-    </modal>
+    </modal>-->
     <modal v-if="showPrint" :show.sync="showPrint" 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>
@@ -794,7 +794,7 @@ export default {
             {resolveMsg: null, rejectMsg: '查询失败！！！'}
           )
           for (let i =0;i<res1.data.length;i++){
-            if (isEmpty(res1.data[i].f_confirm_person)  || isEmpty(res1.data[i].f_auditor_person)){
+            if (isEmpty(res1.data[i].f_confirm_person)){
               flag = false
             }
           }