apply-clients 5.0.35-72 → 5.0.35-75

package/package.json

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

package/src/components/app_apply/ServiceControl.vue

@@ -97,6 +97,8 @@ export default {
         f_room:this.models2.f_room,
         f_address:this.models2.f_address,
         f_idnumber:this.models2.f_social_credit_code,
+        f_apply_source:this.models2.f_apply_source,
+        f_sub_state:'未完工',
         user:Vue.user
       }
       await http.load('POST',this.$androidUtil.getProxyUrl() +'/rs/logic/newaddApplyproduct',{data:data}, {resolveMsg: null, rejectMsg: '转发失败，请联系开发人员'})
@@ -651,6 +653,11 @@ export default {
         return
       }
       let http = new HttpResetClass()
+      if (this.data.defname === '通气转单'&& model.button.button_name === '提交'){
+        requestData.model.f_sub_state = '完工'
+      }else {
+        requestData.model.f_sub_state = '未完工'
+      }
       var url = this.$androidUtil.getProxyUrl() + '/rs/logic/ApplyProductService'
      // let res = await http.load('POST',url,{data:data}, {resolveMsg: null, rejectMsg: null})
       // // 先判断是否包含code，如果服务端异常，可能不存在code

package/src/components/product/EngineeringManagement/EngineeringSelect.vue

@@ -22,7 +22,7 @@
                 </div>
               </div>
               <div class="col-sm-2">
-                <label class="col-sm-4 control-label">报装地址</label>
+                <label class="col-sm-4 control-label">工程地址</label>
                 <div class="col-sm-8">
                   <input type="text" class="form-control" placeholder='用户地址' v-model="model.f_address"
                          v-on:keyup.enter="search"
@@ -82,19 +82,14 @@
               </div>
 
               <div class="col-sm-2" style="float: left">
-                <label class="col-sm-4 control-label">报装来源</label>
+                <label class="col-sm-4 control-label">工程来源</label>
                 <div class="col-sm-8">
-                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'全部',value:''},{label:'燃气系统',value:'燃气系统'},{label:'住建局',value:'住建局'}]"
-                            condition="f_apply_source = '{}'" placeholder='报装来源'
+                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'全部',value:''},...this.$appdata.getParam('报装来源')]"
+                            condition="f_apply_source = '{}'" placeholder='工程来源'
                             v-model="model.f_apply_source" :value.sync="model.f_apply_source" close-on-select>
                   </v-select>
                 </div>
               </div>
-
-
-
-            </div>
-            <div class="col-sm-12 " style="margin-top:5px">
               <div class="col-sm-2">
                 <label class="col-sm-4 control-label ">用户类型</label>
                 <div class="col-sm-8">
@@ -104,6 +99,10 @@
                   </v-select>
                 </div>
               </div>
+
+            </div>
+            <div class="col-sm-12 " style="margin-top:5px">
+
             </div>
 
 
@@ -258,7 +257,7 @@ export default {
       containt: this.$appdata.getParam('工作内容'),
       condition:'',
       select: '',
-      alloptions:[],
+      alloptions:[{label:"踏勘",value:"踏勘"},{label:"施工",value:"施工"},{label:"施工验收",value:"施工验收"},{label:"通气转单",value:"通气转单"}],
       button_name:"查询",
       showstopinfoflag:false,
       stopremarks:"",
@@ -305,7 +304,7 @@ export default {
     closestopinfo(){
       this.showstopinfoflag = close;
     },
-    getapplyName(str){
+   /* getapplyName(str){
       console.log("开始获取所有名")
       console.log(JSON.stringify(str.activitys))
       let param = [];
@@ -318,7 +317,7 @@ export default {
       })
       this.alloptions = param;
 
-    },
+    },*/
     generateUUID() {
       var d = new Date().getTime()
       var uuid = 'xxxxxxxx-xxxx-xxxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {

package/src/components/product/Function/functions/InstallFee.vue

@@ -64,6 +64,9 @@
                     <th>
                       <nobr>地址</nobr>
                     </th>
+                    <th>
+                      <nobr>缴费状态</nobr>
+                    </th>
                     <th>
                       <nobr>操作</nobr>
                     </th>
@@ -74,8 +77,9 @@
                   <td style="text-align: center">{{row.f_user_name}}</td>
                   <td style="text-align: center">{{row.f_user_phone}}</td>
                   <td style="text-align: center">{{row.address}}</td>
+                  <td style="text-align: center">{{row.f_charging_status=='有效'?'已缴':'未缴'}}</td>
                   <button type="button" name="button" class="btn btn-link"
-                          @click.stop="$parent.$parent.$parent.getUserinfo($index)">收费
+                          @click.stop="$parent.$parent.$parent.getUserinfo($index)">{{row.f_charging_status=='有效'?'已收':'收费'}}
                   </button>
                 </template>
               </data-grid>
@@ -1059,8 +1063,11 @@
           resolveMsg: null,
           rejectMsg: '获取用户信息失败！'
         })
+        console.dir(userinfores.data)
+        console.log(userinfores.data[0].f_charging_status=='有效'?'已缴':'未缴')
         this.userinfoRow.rows = userinfores.data;
 
+
         this.oldInfo.f_user_name = this.model.f_user_name;
         this.oldInfo.f_phone = this.model.f_phone;
         this.oldInfo.f_address = this.model.f_address;

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

@@ -181,8 +181,9 @@
         <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_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">{{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>元-->
           </p>
         </div>
       </div>