npm - apply-clients - Versions diffs - 4.1.10-weinan → 4.1.11-weinan-1 - Mend

apply-clients 4.1.10-weinan → 4.1.11-weinan-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/package.json +1 -1
package/src/components/app_apply/AppChargeManagement.vue +14 -8
package/src/components/app_apply/ApplyToDoList.vue +1 -1
package/src/components/app_apply/ServiceControl.vue +22 -0
package/src/components/product/Supervisory/SupervisoryList.vue +221 -221

package/package.json CHANGED Viewed

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

package/src/components/app_apply/AppChargeManagement.vue CHANGED Viewed

@@ -142,7 +142,7 @@
     <modal  :show.sync="showQrCode" v-ref:qrcodemodal :large="true" :backdrop="false" style="height: 100%">
       <header slot="modal-header" class="modal-header">
-        <h4 class="modal-title">微信扫码支付</h4>
+        <h4 class="modal-title">{{title1}}扫码支付</h4>
       </header>
       <article slot="modal-body" class="modal-body clearfix">
         <div class="text-center">
@@ -199,7 +199,8 @@ export default {
       filiale:"",
       config: {
-      }
+      },
+      title1:''
     }
   },
   ready () {
@@ -237,12 +238,10 @@ export default {
       // 查询订单状态
       let http = new HttpResetClass()
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {
         data: {
-          items: "id",
           tablename: "t_weixinreturnxml",
-          condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_orde_state = '已支付' `,
-          orderitem: "id"
+          condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_order_state = '已支付' `,
         }
       }, {
         resolveMsg: null,
@@ -322,6 +321,12 @@ export default {
         })
         return
       }
+      if (this.charge.f_payment_method == '微信支付'){
+        this.title1 = '微信'
+      }
+      if (this.charge.f_payment_method == '支付宝支付'){
+        this.title1 = '支付宝'
+      }
       this.showCharge=false
       //this.$dispatch('changeShowfei','待付款')
       //this.saveCharge()
@@ -329,8 +334,9 @@ export default {
       let data = {
         money: this.accMul(this.getTotalAmount() ,1) + '',
         attach: {
-          "f_apply_num": this.selectdata.f_apply_num,
-          "f_user": Vue.user.id
+          apply: this.selectdata,
+          charge: this.charge,
+          user: Vue.user
         },
         orderType:'报装收费',
         userfilesid:'',

package/src/components/app_apply/ApplyToDoList.vue CHANGED Viewed

@@ -92,7 +92,7 @@ export default{
       _this.$back()
     },
     search () {
-      var condition = "1=1"
+      var condition = "1=1 and defname = '现场勘察'"
       var param = {condition: condition,condValue:[],data:{"id": Vue.user.id,orgid: Vue.user.orgid}}
       let http = new HttpResetClass()
       http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,{data:param}).then(res=>{

package/src/components/app_apply/ServiceControl.vue CHANGED Viewed

@@ -227,6 +227,28 @@
         model=Object.assign({},this.selectdata,model)
         console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
         let http = new HttpResetClass()
+        if(this.selectdata.defname = '现场勘察' && this.show_data.f_is_have == '否'  ){
+           this.$showMessage('确定不具备安装条件！','confirm').then(res=>{
+             if (res = 'confirm'){
+               let data = {
+                 loginUser: Vue.user,
+                 selectdata: this.selectdata,
+                 model: this.model
+               }
+               data.model.f_stop_remarks = '不具备安装条件'
+               let http = new HttpResetClass()
+               http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/stopApply', {data: data}, {resolveMsg: null,rejectMsg: '删除失败'})
+                 .then(res => {
+                   if (res.data === 200) {
+                     this.$dispatch('search')
+                   } else {
+                     this.$showMessage('终止报建失败')
+                   }
+                 })
+               return
+             }
+           })
+        }
         var url = this.$androidUtil.getProxyUrl() + '/rs/logic/ApplyProductService'
         // let res = await http.load('POST',url,{data:{tables:this.data.tables,start_activity:this.$workflow_vue.start_activity,model:model,loginUser:Vue.user}}, {resolveMsg: null, rejectMsg: null})
         // // 先判断是否包含code，如果服务端异常，可能不存在code

package/src/components/product/Supervisory/SupervisoryList.vue CHANGED Viewed

@@ -1,221 +1,221 @@
-<template>
-  <div class="col-sm-12">
-    <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="form-group col-sm-4">
-              <label class="font_normal_body">项目名称:</label>
-              <input type="text" class="input_search" v-model="model.f_entry_name"
-                     v-on:keyup.enter="search" condition=" f_entry_name like '%{}%' " placeholder='请输入'>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">报建编号：</label>
-              <input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
-                     v-on:keyup.enter="search"
-                     condition="f_apply_num like '%{}%'">
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">合同编号：</label>
-              <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
-                   v-on:keyup.enter="search"
-                     condition="f_contract_number like '%{}%'">
-            </div>
-            <div class="form-group col-sm-2 button-range">
-              <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
-              <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
-              <div
-                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
-                @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
-                class="button_spacing"
-                style="float: right">
-              </div>
-            </div>
-          </div>
-          <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">报建类型：</label>
-              <v-select
-                v-model="model.f_apply_type"
-                placeholder='报建类型'
-                condition="f_apply_type like '%{}%'"
-                :value.sync="model.f_apply_type"
-                :options='$parent.$parent.applytype'
-                class="select select_list"
-                :value-single="true"
-                @change="$parent.$parent.applyTypeChange()"
-                close-on-select ></v-select>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">办理环节：</label>
-              <v-select
-                v-model="model.defname"
-                placeholder='办理环节'
-                condition="defname = '{}'"
-                :value.sync="model.defname"
-                :options='$parent.$parent.defnames'
-                class="select select_list"
-                :value-single="true"
-                close-on-select ></v-select>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">流程状态：</label>
-              <v-select
-                v-model="model.f_sub_state"
-                placeholder='流程状态'
-                condition="f_sub_state = '{}'"
-                :value.sync="model.f_sub_state"
-                :options='$parent.$parent.f_sub_state'
-                class="select select_list"
-                :value-single="true"
-                close-on-select ></v-select>
-            </div>
-<!--            <div class="form-group col-sm-3">-->
-<!--              <label class="font_normal_body">联系电话：</label>-->
-<!--              <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"-->
-<!--                     v-on:keyup.enter="search"-->
-<!--                     condition="f_phone like '%{}%'">-->
-<!--            </div>-->
-<!--            <div class="form-group col-sm-3">-->
-<!--              <label class="font_normal_body">用户地址：</label>-->
-<!--              <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"-->
-<!--                     v-on:keyup.enter="search"-->
-<!--                     condition="f_address like '%{}%'">-->
-<!--            </div>-->
-            <div class="form-group col-sm-3">
-              <label  for="startDate" class="font_normal_body">开始时间：</label>
-              <datepicker id="startDate" placeholder="开始日期"
-                          style="width: 60%!important;"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="f_apply_date >= '{}'">
-              </datepicker>
-            </div>
-            <div class="form-group col-sm-3">
-              <label for="endDate" class="font_normal_body">结束时间：</label>
-              <datepicker id="endDate" placeholder="结束日期"
-                          style="width: 60%!important;"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="f_apply_date <= '{}'">
-              </datepicker>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid class="list_area table_sy">
-        <template partial='head'>
-          <tr>
-            <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>
-            <th style="white-space: nowrap;">报建日期</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{$index+1}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_num}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_entry_name}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_contract_number}}</nobr>
-            </td>
-<!--            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">-->
-<!--              <nobr>{{row.f_phone}}</nobr>-->
-<!--            </td>-->
-<!--            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">-->
-<!--              <nobr>{{row.f_address}}</nobr>-->
-<!--            </td>-->
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_type}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.defname}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_sub_state}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_date}}</nobr>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-<script>
-  import {PagedList} from 'vue-client'
-  import {HttpResetClass} from 'vue-client'
-  import {isEmpty} from '../../Util'
-  export default {
-    title: '勘探详情',
-    props: ['showData'],
-    data () {
-      return {
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-        model: new PagedList('rs/sql/supervisory', 20, {
-          data: {
-            id: `${this.$login.f.name}`,
-            orgid: this.$login.f.orgid
-          }
-        }),
-        f_sub_state: [{label: '全部', value: ''}, {label: '完工', value: '完工'}, {label: '正在进行', value: '正在进行'}],
-        defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
-        criteriaShow: false
-      }
-    },
-    ready () {
-      // 调用查询
-      this.search()
-    },
-    events: {
-    },
-    methods: {
-      // 查询
-      search () {
-        this.$dispatch('search')
-      },
-      clear () {
-        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          this.$refs.cp.$refs.cri.model[key] = []
-        })
-      },
-      applyTypeChange () {
-        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
-          let http = new HttpResetClass()
-          http.load('POST', 'rs/logic/getDefnameByType', {
-            f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
-          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            this.defnames = [{label: '全部', value: ''}, ...res.data]
-          })
-        } else {
-          this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
-        }
-      },
-      check (val) {
-        this.$dispatch('apply', val)
-      }
-    },
-    computed: {
-    }
-  }
-</script>
-<style scoped>
-</style>
+<template>
+  <div class="col-sm-12">
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">项目名称:</label>
+              <input type="text" class="input_search" v-model="model.f_entry_name"
+                     v-on:keyup.enter="search" condition=" f_entry_name like '%{}%' " placeholder='请输入'>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建编号：</label>
+              <input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
+                     v-on:keyup.enter="search"
+                     condition="f_apply_num like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">合同编号：</label>
+              <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
+                   v-on:keyup.enter="search"
+                     condition="f_contract_number like '%{}%'">
+            </div>
+            <div class="form-group col-sm-2 button-range">
+              <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
+                class="button_spacing"
+                style="float: right">
+              </div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建类型：</label>
+              <v-select
+                v-model="model.f_apply_type"
+                placeholder='报建类型'
+                condition="f_apply_type like '%{}%'"
+                :value.sync="model.f_apply_type"
+                :options='$parent.$parent.applytype'
+                class="select select_list"
+                :value-single="true"
+                @change="$parent.$parent.applyTypeChange()"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">办理环节：</label>
+              <v-select
+                v-model="model.defname"
+                placeholder='办理环节'
+                condition="defname = '{}'"
+                :value.sync="model.defname"
+                :options='$parent.$parent.defnames'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">流程状态：</label>
+              <v-select
+                v-model="model.f_sub_state"
+                placeholder='流程状态'
+                condition="f_sub_state = '{}'"
+                :value.sync="model.f_sub_state"
+                :options='$parent.$parent.f_sub_state'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+<!--            <div class="form-group col-sm-3">-->
+<!--              <label class="font_normal_body">联系电话：</label>-->
+<!--              <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"-->
+<!--                     v-on:keyup.enter="search"-->
+<!--                     condition="f_phone like '%{}%'">-->
+<!--            </div>-->
+<!--            <div class="form-group col-sm-3">-->
+<!--              <label class="font_normal_body">用户地址：</label>-->
+<!--              <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"-->
+<!--                     v-on:keyup.enter="search"-->
+<!--                     condition="f_address like '%{}%'">-->
+<!--            </div>-->
+            <div class="form-group col-sm-3">
+              <label  for="startDate" class="font_normal_body">开始时间：</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="true"
+                          condition="f_apply_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">结束时间：</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="true"
+                          condition="f_apply_date <= '{}'">
+              </datepicker>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <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>
+            <th style="white-space: nowrap;">报建日期</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{$index+1}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_apply_num}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_entry_name}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_contract_number}}</nobr>
+            </td>
+<!--            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">-->
+<!--              <nobr>{{row.f_phone}}</nobr>-->
+<!--            </td>-->
+<!--            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">-->
+<!--              <nobr>{{row.f_address}}</nobr>-->
+<!--            </td>-->
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_apply_type}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.defname}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_sub_state}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_apply_date}}</nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+  import {PagedList} from 'vue-client'
+  import {HttpResetClass} from 'vue-client'
+  import {isEmpty} from '../../Util'
+  export default {
+    title: '勘探详情',
+    props: ['showData'],
+    data () {
+      return {
+        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+        model: new PagedList('rs/sql/supervisory', 20, {
+          data: {
+            id: `${this.$login.f.name}`,
+            orgid: this.$login.f.orgid
+          }
+        }),
+        f_sub_state: [{label: '全部', value: ''}, {label: '完工', value: '完工'}, {label: '正在进行', value: '正在进行'}, {label: '终止', value: '终止'}],
+        defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
+        criteriaShow: false
+      }
+    },
+    ready () {
+      // 调用查询
+      this.search()
+    },
+    events: {
+    },
+    methods: {
+      // 查询
+      search () {
+        this.$dispatch('search')
+      },
+      clear () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = []
+        })
+      },
+      applyTypeChange () {
+        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+          let http = new HttpResetClass()
+          http.load('POST', 'rs/logic/getDefnameByType', {
+            f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
+          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            this.defnames = [{label: '全部', value: ''}, ...res.data]
+          })
+        } else {
+          this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
+        }
+      },
+      check (val) {
+        this.$dispatch('apply', val)
+      }
+    },
+    computed: {
+    }
+  }
+</script>
+<style scoped>
+</style>