apply-clients 3.1.50 → 3.1.53

package/package.json

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

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -56,6 +56,7 @@
                 :value.sync="model.f_residential_area"
                 :options='$parent.$parent.area'
                 class="select select_list"
+                search="true"
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
@@ -131,7 +132,7 @@
                           :value.sync="model.f_charge_date"
                           :format="'yyyy-MM-dd'"
                           :show-reset-button="true"
-                          condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
+                          condition="ch.f_charge_date <= '{} 23:59:59' and ch.f_charge_date >= '{} 00:00:00'">
               </datepicker>
             </div>
           </div>

package/src/components/product/Function/InstallInfoSelect.vue

@@ -55,6 +55,7 @@
                 :value.sync="model.f_residential_area"
                 :options='$parent.$parent.area'
                 class="select select_list"
+                search="true"
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
@@ -120,8 +121,9 @@
       </criteria>
       <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
         <template partial='head'>
-          <tr class="title">
+          <tr>
             <th>序号</th>
+            <th><div style="width:80px">流程操作</div></th>
             <th>报建编号</th>
             <th>当前环节</th>
             <th>客户名称/联系人</th>
@@ -130,7 +132,6 @@
             <th>地址</th>
             <th>报建类型</th>
             <th>报建日期</th>
-            <th>操作</th>
           </tr>
         </template>
         <template partial='body'>
@@ -138,6 +139,18 @@
             <td  style="text-align: center;">
               <nobr>{{$index+1}}</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">
+                    <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
@@ -162,18 +175,6 @@
             <td style="text-align: center;">
               <nobr>{{row.f_apply_date}}</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">
-                    <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
-                  </li>
-                </ul>
-              </dropdown>
-            </td>
           </tr>
         </template>
       </data-grid>

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

@@ -60,6 +60,13 @@
                   :disabled="$parent.$parent.mark === 1 || row.f_charge_state === '作废'"
                   @click="$parent.$parent.showInvalidModal(row)"
                 >作废</button>
+                <button
+                  type="button"
+                  name="button"
+                  class="btn btn-link"
+                  :disabled="$parent.$parent.mark === 1 || row.f_charge_state === '作废'"
+                  @click="$parent.$parent.updateChargeModal(row)"
+                >修改</button>
               </nobr>
             </td>
           </tr>
@@ -74,10 +81,10 @@
       <article slot="modal-body" class="modal-body clearfix">
         <div v-if="data.f_apply_type === '散户报建'" class="form-group col-sm-12 panel panel-info">
           <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
-            <div class="col-sm-6 text-left">设备信息</div>
+            <div class="col-sm-6 text-left">增值产品信息</div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备品牌：</label>
+            <label class="col-sm-4 control-label">增值产品品牌：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -89,7 +96,7 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备类型：</label>
+            <label class="col-sm-4 control-label">增值产品类型：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -101,7 +108,7 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备数量：</label>
+            <label class="col-sm-4 control-label">增值产品数量：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="number"
                      placeholder="设备数量"
@@ -159,7 +166,7 @@
             <div class="col-sm-6 text-left">设备信息</div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备品牌：</label>
+            <label class="col-sm-4 control-label">增值产品品牌：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -171,7 +178,7 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备类型：</label>
+            <label class="col-sm-4 control-label">增值产品类型：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -183,7 +190,7 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备数量：</label>
+            <label class="col-sm-4 control-label">增值产品数量：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="number"
                      placeholder="设备数量"
@@ -242,7 +249,7 @@
               close-on-select ></input-select>
           </div>
         </div>
-        <div class="form-group col-sm-12" :class="charge.f_ticket_number ? '':'has-error'">
+        <div class="form-group col-sm-12">
           <label class="col-sm-2 control-label">票号：</label>
           <div class="col-sm-10">
             <input type="text"
@@ -319,7 +326,8 @@
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click="saveCharge()">新增收费</button>
+        <button type="button" v-if="!showupdateCharge" class="btn btn-primary" @click="saveCharge()">新增收费</button>
+        <button type="button" v-if="showupdateCharge" class="btn btn-primary" @click="updateCharge()">确认修改</button>
       </footer>
     </modal>
     <modal v-if="showInvalid" :show.sync="showInvalid" v-ref:modal :large="true" :backdrop="false" title="作废收费">
@@ -330,10 +338,10 @@
       <article slot="modal-body" class="modal-body clearfix">
         <div v-for="(i, item) in model.userfile.devicesinfo" v-if="data.f_apply_type === '散户报建'" class="form-group col-sm-12 panel panel-info">
           <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
-            <div class="col-sm-6 text-left">设备信息</div>
+            <div class="col-sm-6 text-left">增值产品信息</div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备品牌：</label>
+            <label class="col-sm-4 control-label">增值产品品牌：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -345,7 +353,7 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备类型：</label>
+            <label class="col-sm-4 control-label">增值产品类型：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -357,10 +365,10 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备数量：</label>
+            <label class="col-sm-4 control-label">增值产品数量：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="number"
-                     placeholder="设备数量"
+                     placeholder="增值产品数量"
                      v-model="item.f_devices_num"
                      :value="item.f_devices_num"
                      readonly/>
@@ -512,7 +520,8 @@ export default {
       userfile: {
         devicesinfo: null
       },
-      personList: []
+      personList: [],
+      showupdateCharge: false
     }
   },
   ready () {
@@ -566,6 +575,49 @@ export default {
       e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
       this.charge.f_amount_words = this.smalltoBIG(e.target.value)
     },
+    async updateChargeModal(row) {
+
+      this.charge = row
+      if (this.data.f_apply_type === '散户报建'){
+        await this.openDevicesModal(row)
+      }
+
+      this.showupdateCharge = true
+      this.showCharge = true
+    },
+    async updateCharge() {
+      if(this.data.f_apply_type === '散户报建'){
+        for (let i = 0; i < this.data.fields.length; i++) {
+          if (this.data.fields[i].label === '应交金额') {
+            this.data.f_due_money = this.data.fields[i].value
+          }
+          if (this.data.fields[i].label === '合同价格') {
+            this.data.f_contract_money = this.data.fields[i].value
+            console.log("合同金额",this.data.f_contract_money)
+          }
+        }
+      }
+      let data = {
+        charge: this.charge,
+        selectdata: this.data
+      }
+      console.log()
+      if (this.data.f_apply_type === '散户报建' && this.userfile.devicesinfo !== null){
+
+        data.userfile = this.userfile
+        data.user = this.$login.f
+        data.userfile.devicesinfo.f_ticket_number = this.charge.f_ticket_number
+      }
+      let res = await this.$resetpost(
+        `rs/logic/updateCharge`,
+        data
+      )
+      this.showCharge = false
+      this.showupdateCharge = false
+      this.charge = {}
+
+      this.$dispatch('breakControl', res.data)
+    },
     async saveCharge() {
       this.apply_data()
       // if (isEmpty(this.charge.f_useraddress_id) && this.selectdata.f_apply_type !== '开发商集体报建') {
@@ -619,15 +671,13 @@ export default {
         data.userfile.devicesinfo.f_ticket_number = this.charge.f_ticket_number
       }
       console.log("开始收费：" + JSON.stringify(data))
-      try {
-        let res = await http.load('POST', 'rs/logic/addCharge', {data: data}, {
-          resolveMsg: null,
-          rejectMsg: null
-        })
-        this.update_data()
-      } catch (e) {
-        this.$showAlert(e.data, 'danger', 3000)
-      }
+      let res
+
+      res = await http.load('POST', 'rs/logic/addCharge', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+
       if (this.data.f_apply_type === '散户报建' && this.userfile.devicesinfo){
         // this.addDevice()
       }
@@ -638,7 +688,7 @@ export default {
       this.charge.f_charge_remarks = ''
       this.charge.f_charge_date = ''
       this.charge.f_ticket_number = ''
-      this.search()
+      this.$dispatch('breakControl', res.data)
     },
     // 金额转大写
     smalltoBIG(n) {
@@ -727,6 +777,14 @@ export default {
     },
     async apply_data () {
       for (let i = 0; i < this.data.fields.length; i++) {
+        if(this.data.f_apply_type === '散户报建') {
+          if (this.data.fields[i].label === '合同价格') {
+            this.data.f_contract_money = this.data.fields[i].value
+          }
+          if (this.data.fields[i].label === '应交金额') {
+            this.data.f_due_money = this.data.fields[i].value
+          }
+        }
         if (this.data.fields[i].label == '应交金额') {
           this.applydata.f_due_money = this.data.fields[i].value
           console.log("应交金额:" + this.data.fields[i].value)
@@ -753,12 +811,12 @@ export default {
     async update_data () {
       for (let i = 0; i < this.data.fields.length; i++) {
         if (this.data.fields[i].label == '累计缴费金额') {
-          this.data.fields[i].value = Number(this.applydata.f_cumulative_money) + Number(this.charge.f_charge_money)
-          this.data.f_cumulative_money = Number(this.applydata.f_cumulative_money) + Number(this.charge.f_charge_money)
+          this.data.fields[i].value = Number(this.data.f_cumulative_money) + Number(this.charge.f_charge_money)
+          this.data.f_cumulative_money = Number(this.data.f_cumulative_money) + Number(this.charge.f_charge_money)
         }
         if (this.data.fields[i].label == '欠费金额') {
-          this.data.fields[i].value = Number(this.applydata.f_arrears_money) - Number(this.charge.f_charge_money)
-          this.data.f_arrears_money = Number(this.applydata.f_arrears_money) - Number(this.charge.f_charge_money)
+          this.data.fields[i].value = Number(this.data.f_arrears_money) - Number(this.charge.f_charge_money)
+          this.data.f_arrears_money = Number(this.data.f_arrears_money) - Number(this.charge.f_charge_money)
         }
       }
       if (this.data.f_apply_type === '散户报建'){
@@ -780,16 +838,18 @@ export default {
       for (let i = 0; i < this.data.fields.length; i++) {
         if (this.data.fields[i].label == '累计缴费金额') {
           this.data.fields[i].value = Number(this.data.f_cumulative_money) - Number(row.f_charge_money)
+          this.data.f_cumulative_money = this.data.fields[i].value
         }
         if (this.data.fields[i].label == '欠费金额') {
           this.data.fields[i].value = Number(this.data.f_arrears_money) + Number(row.f_charge_money)
+          this.data.f_arrears_money = this.data.fields[i].value
         }
       }
     },
     async openDevicesModal (row) {
       let data = {
         tablename: 't_devices',
-        condition: `f_process_id = '${this.data.f_process_id}' and f_ticket_number = '${row.f_ticket_number}' and f_devices_state = '有效'`
+        condition: `f_process_id = '${this.data.f_process_id}' and f_charge_id = '${row.id}' and f_devices_state = '有效'`
       }
       let res = await this.$resetpost(
         `rs/sql/singleTable`,
@@ -797,8 +857,12 @@ export default {
         {resolveMsg: null, rejectMsg: '设备查询失败！！！'}
       )
 
-      Vue.set(this.model.userfile, 'devicesinfo', res.data)
-      console.log("设备信息",this.model.userfile.devicesinfo)
+      if (res.data.length > 0){
+        Vue.set(this.model.userfile, 'devicesinfo', res.data)
+        Vue.set(this.userfile, 'devicesinfo', res.data[0])
+        console.log("设备信息",this.model.userfile.devicesinfo)
+        console.log("设备信息",this.userfile.devicesinfo)
+      }
     },
     async addDevice () {
       let data = {
@@ -817,7 +881,7 @@ export default {
     async deleteDevice (row) {
       let data = {
         f_process_id: this.data.f_process_id,
-        f_ticket_number: row.f_ticket_number,
+        f_charge_id: row.id,
         user: this.$login.f
       }
       let res = await this.$resetpost(
@@ -830,10 +894,12 @@ export default {
     closeModal() {
       this.showCharge = false
       this.showInvalid = false
+      this.showupdateCharge = false
       if (this.data.f_apply_type === '散户报建') {
         this.model.userfile = null
       }
       this.charge = {}
+      this.userfile.devicesinfo = null
       this.chargeUseraddress = null
       this.search()
     },

package/src/components/product/Process/ExplorationSelect.vue

@@ -50,6 +50,7 @@
                   :value.sync="model.f_residential_area"
                   :options='$parent.$parent.area'
                   class="select select_list"
+                  search="true"
                   :value-single="true"
                   close-on-select ></v-select>
               </div>
@@ -123,6 +124,7 @@
         <template partial='head'>
           <tr>
             <th>序号</th>
+            <th>流程操作</th>
             <th>报建编号</th>
             <th>客户名称/联系人</th>
             <th>当前状态</th>
@@ -132,7 +134,6 @@
             <th>地址</th>
             <th>报建类型</th>
             <th>报建日期</th>
-            <th>操作</th>
           </tr>
         </template>
         <template partial='body'>
@@ -140,6 +141,18 @@
             <td style="text-align: center;">
               <nobr><font>{{$index+1}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <dropdown>
+                <button 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>
+                    <a href="#" @click="$parent.$parent.$parent.click(row)">{{row.defname}}</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
@@ -167,18 +180,6 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_date}}</font></nobr>
             </td>
-            <td style="text-align: center;">
-              <dropdown>
-                <button 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>
-                    <a href="#" @click="$parent.$parent.$parent.click(row)">{{row.defname}}</a>
-                  </li>
-                </ul>
-              </dropdown>
-            </td>
           </tr>
         </template>
       </data-grid>

package/src/components/product/Process/Service/ServiceControl.vue

@@ -847,8 +847,34 @@
 
 
 
-      }
+      },
+      async stopApply () {
+        console.log('终止报建！！！！！')
+
+        if (this.show_data.defname === '报建受理') {
+          this.show_data.f_stop_reason = this.show_data.f_accept_result
+        }
+        if (this.show_data.defname === '现场勘察') {
+          this.show_data.f_stop_reason = this.show_data.f_project_describe
+        }
+        if(!this.show_data.f_stop_reason){
+          this.show_data.f_stop_reason = '终止'
+        }
+        let data = {
+          selectdata: this.show_data,
+          loginUser: this.$login.f,
+          model: {f_stop_remarks: this.show_data.f_stop_reason}
+        }
+
+        let res = await this.$resetpost(
+          `rs/logic/stopApply`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '终止报建失败！！！'}
+        )
 
+        this.$dispatch('selfsearch')
+
+      }
     },
     events: {
       test(i, j){
@@ -857,6 +883,11 @@
       },
       // 获取view层button事件/
       async 'button'(model) {
+        //before事件
+        console.log("当前按钮",model.button)
+        if (model.button.before) {
+          await this[model.button.before]()
+        }
         // 点击重置按钮就重置数据
         if (model.button.button_name === '重置') {
           this.refurbish()

package/src/components/product/Report/ApplyDevicesList.vue

@@ -110,7 +110,7 @@
             <nobr><font>{{ $index+1 }}</font></nobr>
           </td>
           <td style="text-align: center;">
-            <nobr><font>{{ row.f_operation_date }}</font></nobr>
+            <nobr><font>{{ row.f_charge_date }}</font></nobr>
           </td>
           <td style="text-align: center;">
             <nobr><font>{{ row.f_user_name }}</font></nobr>
@@ -188,7 +188,7 @@ export default {
         sum: 0
       },
       getfield: {
-        'f_operation_date': '     收 费 时 间     ',
+        'f_charge_date': '     收 费 时 间     ',
         'f_user_name': '  姓  名  ',
         'f_phone': '    电  话    ',
         'f_residential_area': '  小 区 名 称   ',

package/src/components/product/ServiceView.vue

@@ -399,6 +399,9 @@
         }
         buttondatas.button_name = button.button_name
         buttondatas.button_index = index
+        if (button.before){
+          buttondatas.before = button.before
+        }
         if (button.button_fields) {
           button.button_fields.forEach(item => {
             buttondatas.button_fields[item.field] = item.value

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

@@ -55,6 +55,7 @@
                 condition="u.f_residential_area = '{}'"
                 :value.sync="model.f_residential_area"
                 :options='$parent.$parent.area'
+                search="true"
                 class="select select_list"
                 :value-single="true"
                 close-on-select ></v-select>

package/src/components/product/Supervisory/SupervisoryList2.vue

@@ -55,6 +55,7 @@
                 :value.sync="model.f_residential_area"
                 :options='$parent.$parent.area'
                 class="select select_list"
+                search="true"
                 :value-single="true"
                 close-on-select ></v-select>
             </div>