apply-clients 3.3.65 → 3.3.69

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

@@ -110,10 +110,10 @@
             <div class="col-xs-8" >
               <v-select
                 width="100%"
-                v-model="model.f_is_later"
+                v-model="model.f_no_valid"
                 placeholder='稍后处理'
-                condition="f_is_later = '{}'"
-                :value.sync="model.f_is_later"
+                condition="f_no_valid = '{}'"
+                :value.sync="model.f_no_valid"
                 :options='$parent.$parent.laterList'
                 class="select select_list"
                 :value-single="true"
@@ -148,7 +148,7 @@
             </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>客户编号：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_userinfo_code }}</p>
+              <p :class="[ row.defname =='通气点火' && (row.f_apply_nature=='热水器' || row.f_apply_nature=='壁挂炉') ? 'redy' : (row.f_apply_nature=='热水器' || row.f_apply_nature=='壁挂炉' ? 'pred': (row.defname =='通气点火' ? 'p1':''))]" class="col-xs-9 text-left input-font">{{ row.f_userinfo_code }}</p>
             </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
@@ -171,14 +171,51 @@
               <p class="col-xs-9 text-left input-font">{{ row.f_construction_remarks }}</p>
             </div>
 
+            <div class="col-xs-12">
+              <p class="col-xs-4 text-left font"><b>稍后处理备注：</b></p>
+              <p class="col-xs-8 text-left input-font">{{row.f_later_remarks}}</p>
+            </div>
+
+            <div class="col-xs-12" v-if="row.f_back_reason != null">
+              <p class="col-xs-4 text-left font"><b>退回备注：</b></p>
+              <p class="col-xs-8 text-left input-font">
+                <span style="color: red;font-family: 微软雅黑;font-weight: bold;font-size: 18px">请注意被退回原因为:{{row.f_back_reason}} 退回时间：{{row.f_date}}</span>
+              </p>
+            </div>
+
             <div class="col-xs-12 text-right">
-              <button class="btn btn-info" @click="$parent.$parent.$parent.later(row)" v-if="row.f_is_later !== '是'">稍后处理</button>
+              <button class="btn btn-info" type="button" @click="$parent.$parent.$parent.show(row) " v-if="row.f_no_valid != '有效'">稍后处理</button>
               <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">处理</button>
             </div>
           </div>
         </div>
       </list>
+
     </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="textarea"
+                     class="form-control input_view"
+                     style="width: 100%"
+                     v-model="laterapply.f_later_remarks" />
+            </div>
+          </div>
+        </article>
+
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="later(selectdate)">稍后处理</button>
+        </footer>
+      </modal>
+    </validator>
   </div>
 </template>
 <script>
@@ -189,23 +226,27 @@ export default {
   title: '报建流程',
   data () {
     return {
+      selectdate: {},
+      showCharge: false,
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`, 20, {
       // model: new PagedList('rs/sql/checkuser', 20, {
         data: {
+
           id: Vue.user.id,
           orgid: Vue.user.orgid
           // id: '51953',
           // orgid: '10101'
-        }
+        },
+        laterapply:{}
       }),
       criteriaShow: false,
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+      // applytype:[{label: '全部', value: ''},{label: '增容报建', value: '增容报建'}],
       defnames: [{label: '全部', value: ''}],
       applyNatures: [{label: '全部', value: ''}], // 报建性质
       laterList: [
         {label: '全部', value: ''},
-        {label: '是', value: '是'},
-        {label: '否', value: '否'}
+        {label: '有效', value: '有效'}
       ]
     }
   },
@@ -213,18 +254,30 @@ export default {
     this.search()
   },
   methods: {
+    show(row){
+      debugger
+      this.selectdate = row
+      this.showCharge=true
+    },
     async later (row) {
-      let res = await this.$showMessage('您确定要将此任务加入稍后处理吗？', ['confirm'])
-
-      if (res === 'confirm') {
-        row.f_is_later = '是'
-        let res = await this.$resetpost(
-          'rs/entity/t_apply',
-          row
-        )
-
-        this.$refs.cp.$refs.cri.search()
+      debugger
+        let http = new HttpResetClass()
+      let data = {
+        laterapply: this.laterapply,
+        selectdata: row,
+        user: Vue.user
       }
+      let res = await http.load('POST', 'rs/logic/laterprocessing', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '稍后处理记录保存失败！！！'
+      })
+      this.closeModal()
+    },
+
+    closeModal() {
+      this.showCharge = false
+      this.laterapply = {}
+      this.search()
     },
     dialNumber (phone) {
       this.$showMessage(`是否拨打电话：${phone}`, ['confirm']).then((res) => {
@@ -279,7 +332,7 @@ export default {
   },
   computed: {
     appDefnames () {
-      // let list = [{label: '报装缴费', value: '报装缴费'}, {label: '通气点火', value: '通气点火'}]
+      // let list = [{label: '报装缴费', value: '报装缴费'}, {label: '通气点火', value: '通气点火'},{label: '工程施工', value: '工程施工'},{label: '工程派工', value: '工程派工'},{label: '点火派单', value: '点火派单'}]
       let list = this.$appdata.getParam('手机节点')
       return `(${list.map(item => `'${item.value}'`).toString()})`
     }
@@ -287,6 +340,15 @@ export default {
 }
 </script>
 <style scoped>
+  .pred{
+    color: red;
+  }
+  .p1 {
+    color: #ffaf4f;
+  }
+  .redy{
+    color: deeppink;
+  }
   .panel-self{
     border-radius: 10px;
     border:1px solid #499EDF;

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

@@ -34,7 +34,7 @@
       </div>
     </list>
 
-    <modal v-if="showUserFile" :show.sync="showUserFile" v-ref:modal :large="true" :backdrop="false" title="安装明细">
+    <modal v-if="showUserFile" :show.sync="showUserFile" v-ref:modal :large="true" :backdrop="false" title="安装明细" width="100%">
       <header slot="modal-header" class="modal-header">
         <button type="button" class="close" @click="closeUserFile"><span>&times;</span></button>
         <h4 class="modal-title">安装明细</h4>
@@ -108,6 +108,7 @@
             <label class="col-xs-4 control-label">表&ensp;读&ensp;数：</label>
             <div class="col-xs-8">
               <input class="form-control input_view" style=""
+                     onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
                      type="number"
                      placeholder="表读数"
                      v-model="item.f_meter_base"
@@ -119,6 +120,7 @@
             <label class="col-xs-4 control-label">初始底数：</label>
             <div class="col-xs-8">
               <input class="form-control input_view" style=""
+                     onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
                      type="number"
                      v-model="item.f_initial_base"
                      :value="item.f_initial_base"
@@ -387,7 +389,7 @@ export default {
         condition: `ua.f_process_id = '${this.selectdata.f_process_id}'`
       }
 
-      if (this.selectdata.f_apply_type === '团购转散户') {
+      if (this.selectdata.f_apply_type === '团购转散户' || this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建') {
         data.condition = `ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
       }
       let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getAddresAndUserinfoAndUserfilesAmount`, {data:data}, {