apply-clients 3.0.10-21 → 3.0.10-210

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

@@ -9,10 +9,10 @@
           <installinfodown v-ref:installdown></installinfodown>
         </div>
         <div class="col-sm-12" v-show="clishow">
-          <div class="col-sm-3">
-            <installfeeinfo :infeeinfo="selectdata"></installfeeinfo>
+          <div class="col-sm-1">
+<!--            <installfeeinfo :infeeinfo="selectdata"></installfeeinfo>-->
           </div>
-          <div class="col-sm-9">
+          <div class="col-sm-11">
             <function-service-control v-ref:fsc :funcdata = "funcdata" :selectdata="selectdata"></function-service-control>
           </div>
         </div>
@@ -21,10 +21,10 @@
           <route v-ref:route></route>
         </div>
       </div>
-      <div style="width: 20%;padding:0px 0px 0px 0px;margin-left: 0px">
-        <install-apply-cardlist :btns="operatebtn" :userinfoid="row ? row.f_userinfo_id : ''" @list-select-oper="recordCancel"
-                          v-ref:card></install-apply-cardlist>
-      </div>
+<!--      <div style="width: 20%;padding:0px 0px 0px 0px;margin-left: 0px">-->
+<!--        <install-apply-cardlist :btns="operatebtn" :userinfoid="row ? row.f_userinfo_id : ''" @list-select-oper="recordCancel"-->
+<!--                          v-ref:card></install-apply-cardlist>-->
+<!--      </div>-->
     </div>
   </div>
 </template>
@@ -106,7 +106,7 @@
         this.totalheight = '100%'
         this.$refs.installselect.$refs.cp.$refs.cri.search()
         // this.$refs.installdown.$refs.cp.$refs.cri.search()
-        this.$refs.card.$refs.paged.$refs.cri.search()
+        // this.$refs.card.$refs.paged.$refs.cri.search()
       },
       'showline'(value) {
         this.show = false
@@ -115,7 +115,7 @@
       'searchcard'() {
         this.$refs.installselect.$refs.cp.$refs.cri.search()
         // this.$refs.installdown.$refs.cp.$refs.cri.search()
-        this.$refs.card.$refs.paged.$refs.cri.search()
+        // this.$refs.card.$refs.paged.$refs.cri.search()
       },
       'list-select-oper'() {
         this.leftheight = '50%'

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

@@ -5,22 +5,31 @@
         <criteria partial='criteria' @condition-changed='search' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
           <form novalidate class="" partial>
             <div class="col-sm-12">
-              <div class="form-group col-sm-4">
-                <label class=" col-sm-6" style="padding-top: 8px">客户名称/联系人:</label>
+              <div class="form-group col-sm-2" >
+                <label class="col-sm-6">所属公司:</label>
                 <div class="col-sm-6">
-                  <input type="text" class="form-control" v-model="model.f_user_name"
-                         condition=" (f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='二选一输入'>
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.apply_org" placeholder='所属公司' condition="f_filiale = '{}'"
+                            v-model="model.f_filiale" @change="$parent.$parent.orgChange" :value.sync="model.f_filiale" close-on-select>
+                  </v-select>
                 </div>
               </div>
-              <div class="col-sm-1">
-                <!--<label class="col-sm-6">合同编号</label>-->
-                <div class="col-sm-12">
-                  <input type="text" class="form-control" placeholder='合同编号' v-model="model.f_contract_number"
-                         v-on:keyup.enter="search"
-                         condition="f_contract_number like '%{}%'">
+              <div class="form-group col-sm-2">
+                <label class="col-sm-6">项目名称:</label>
+                <div class="col-sm-6">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.entry_name" placeholder='项目名称' condition="f_entry_name = '{}'"
+                            v-model="model.f_entry_name" @change="$parent.$parent.entryChange" :value.sync="model.f_entry_name" close-on-select>
+                  </v-select>
+                </div>
+              </div>
+              <div class="form-group col-sm-2">
+                <label class="col-sm-6">项目编号:</label>
+                <div class="col-sm-6">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.entry_num" placeholder='项目编号' condition="f_entry_num = '{}'"
+                            v-model="model.f_entry_num" :value.sync="model.f_entry_num" close-on-select>
+                  </v-select>
                 </div>
               </div>
-              <div class="col-sm-1">
+              <div class="form-group col-sm-1">
                 <!--<label class="col-sm-6">用户地址</label>-->
                 <div class="col-sm-12">
                   <input type="text" class="form-control" placeholder='用户地址' v-model="model.f_address"
@@ -28,16 +37,16 @@
                          condition="f_address like '%{}%'">
                 </div>
               </div>
-              <div class="col-sm-1">
+              <div class="form-group col-sm-1">
                 <!--<label class="col-sm-6"> 报建类型：</label>-->
-                <div class="col-sm-12" v-if="!this.$login.f.f_fengongsi.includes('中燃')">
+                <div class="col-sm-12">
                   <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.applytype" placeholder='报建类型' condition="f_apply_type  like '%{}%'"
                             v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>
                   </v-select>
                 </div>
               </div>
-              <div class="col-sm-2">
-                <label class="col-sm-6">办理环节:</label>
+              <div class="form-group col-sm-1">
+<!--                <label class="col-sm-6">办理环节:</label>-->
                 <div class="col-sm-6">
                   <v-select :width ="'90%'" @change="$dispatch('setQueryCondition',model)" :options="$parent.$parent.defnames"
                             condition="defname = '{}'" placeholder='办理环节'
@@ -45,12 +54,20 @@
                   </v-select>
                 </div>
               </div>
-              <div class="col-sm-1">
-                <input type="text" class="form-control" placeholder='经办人' v-model="model.operator"
-                       v-on:keyup.enter="search"
-                       condition=" operator like '%{}%' ">
+              <div class="form-group col-sm-1">
+                <!--<label class="col-sm-6"> 报建类型：</label>-->
+                <div class="col-sm-12">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.projecttype" placeholder='项目类型' condition="f_project_type  like '%{}%'"
+                            v-model="model.f_project_type" :value.sync="model.f_project_type" close-on-select>
+                  </v-select>
+                </div>
               </div>
-              <div class="col-sm-1">
+<!--              <div class="form-group col-sm-1">-->
+<!--                <input type="text" class="form-control" placeholder='经办人' v-model="model.f_apply_operator"-->
+<!--                       v-on:keyup.enter="search"-->
+<!--                       condition=" f_apply_operator like '%{}%' ">-->
+<!--              </div>-->
+              <div class="form-group col-sm-1">
                 <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.showpager()">
                   <span class="glyphicon glyphicon-search"></span>查询
                 </button>
@@ -67,9 +84,14 @@
               <th>
                 <nobr>当前环节</nobr>
               </th>
-              <th><nobr>客户名称/联系人</nobr></th>
               <th>
-                <nobr>合同编号</nobr>
+                <nobr>项目名称</nobr>
+              </th>
+              <th>
+                <nobr>项目编号</nobr>
+              </th>
+              <th>
+                <nobr>用户名称</nobr>
               </th>
               <th>
                 <nobr>电话</nobr>
@@ -77,18 +99,18 @@
               <th>
                 <nobr>地址</nobr>
               </th>
-              <th v-if="!this.$login.f.f_fengongsi.includes('中燃')">
-                <nobr>用户类型</nobr>
-              </th>
               <th>
                 <nobr>报建类型</nobr>
               </th>
               <th>
-                <nobr>报建日期</nobr>
+                <nobr>项目类型</nobr>
               </th>
               <th>
-                <nobr>申请户数</nobr>
+                <nobr>报建日期</nobr>
               </th>
+<!--              <th>-->
+<!--                <nobr>申请户数</nobr>-->
+<!--              </th>-->
               <th>
                 <nobr>操作</nobr>
               </th>
@@ -103,10 +125,13 @@
                 <nobr>{{row.defname}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_user_name}}/{{row.f_contact}}</nobr>
+                <nobr>{{row.f_entry_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_entry_num}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_contract_number}}</nobr>
+                <nobr>{{row.f_user_name}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_phone}}</nobr>
@@ -114,20 +139,21 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
-              <td style="text-align: center;" v-if="!this.$login.f.f_fengongsi.includes('中燃')">
-                <nobr>{{row.f_user_type}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_apply_type}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_apply_date}}</nobr>
+                <nobr>{{row.f_project_type}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_apply_count}}</nobr>
+                <nobr>{{row.f_apply_date}}</nobr>
               </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_apply_count}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
-                <dropdown v-if="row.defname != '完工'" >
+<!--                <dropdown v-if="row.defname != '完工'" >-->
+                <dropdown>
                   <button @click="$dispatch('checkfuncs',row)" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
                     <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
                   </button>
@@ -158,7 +184,8 @@
         refreshed:true,
         usertype: this.$appdata.getParam('用户类型'),
         defnameType: this.$appdata.getParam('流程状态'),
-        applytype: this.$appdata.getParam('报建类型'),
+        projecttype: this.$appdata.getParam('项目类型'),
+        applytype: [{label:"全部",value:''},{label:"新用户",value:'新用户'},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
         //中燃 专用
         fapplytype: this.$appdata.getParam('用户类型'),
         funcs:[],
@@ -168,13 +195,18 @@
           data: {
             id: this.$login.f.id,
             orgs: this.$login.f.orgs,
-            company: `${this.$login.f.orgs === '湖南燎原燃气有限公司' ? "u.f_apply_num = '1' or 1 = 1" : '1 = 1'}`
+            company: `${this.$login.f.orgs === '重庆盛焰集团' ? "u.f_apply_num = '1' or 1 = 1" : '1 = 1'}`
           }
         }),
-        condition: ''
+        condition: '',
+        entry_name: [],
+        entry_num: [],
+        apply_org: []
       }
     },
     ready() {
+      this.getOrgName()
+      this.getEntry()
       this.$refs.cp.$refs.cri.search()
       let http = new HttpResetClass()
       http.load('POST', 'rs/sql/getDefnamesForActivityins', {data:{}}, {
@@ -202,6 +234,48 @@
       }
     },
     methods: {
+      // 获取所有组织名称
+      async getOrgName() {
+        let http = new HttpResetClass()
+        let org = this.$login.f.orgs === '重庆盛焰集团' || this.$login.f.orgs === '湖南燎原燃气有限公司' ? " 1 = 1" : " name = '" + this.$login.f.orgs + "'"
+        let data = {
+          tablename: 't_organization',
+          condition: " name != '组织机构' and " + org
+
+        }
+        let res = await http.load('POST','rs/sql/applysingleTable',{data:data}, {
+          resolveMsg: null,
+          rejectMsg: '获取公司名称失败'
+        })
+        for (let i = 0; i < res.data.length; i++) {
+          //  所属公司
+          let data1 = []
+          let array1 = []
+          data1 = res.data.map(item => {
+            return item.name;
+          })
+          for (let q = 0; q < data1.length; q++) {
+            let arraydata = {
+              'label': data1[q],
+              'value': data1[q]
+            }
+            if (array1.length != 0) {
+              for (let w = 0; w < array1.length; w++) {
+                if (array1[w].label == data1[q]) {
+                  break
+                }
+                while (w == array1.length - 1) {
+                  array1.push(arraydata)
+                  break
+                }
+              }
+            } else {
+              array1.push(arraydata)
+            }
+          }
+          this.apply_org = array1
+        }
+      },
       update(){
         this.refreshed = false
         this.$nextTick(()=>{
@@ -216,6 +290,124 @@
       showpager() {
         this.$refs.cp.pager = true
         this.$dispatch('hiddenbtn')
+      },
+      async getEntry(val) {
+        // 获取项目名称和项目编号
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_apply',
+          condition: this.$login.f.orgs === '重庆盛焰集团' ? " 1 = 1" : " f_filiale = '" + this.$login.f.orgs + "'"
+        }
+        // 判断是不是总公司得账号
+        if (this.$login.f.orgs == '重庆盛焰集团' || this.$login.f.orgs == '湖南燎原燃气有限公司') {
+          data.condition = " f_filiale = '" + val + "'"
+        }
+        let res = await http.load('POST','rs/sql/applysingleTable',{data:data}, {
+          resolveMsg: null,
+          rejectMsg: '获取项目名称和项目编号失败'
+        })
+        for (let i = 0; i < res.data.length; i++) {
+          //  项目名称
+          let data = []
+          let array = []
+          data = res.data.map(item => {
+            return item.f_entry_name;
+          })
+          for (let q = 0; q < data.length; q++) {
+            let arraydata = {
+              'label': data[q],
+              'value': data[q]
+            }
+            if (array.length != 0) {
+              for (let w = 0; w < array.length; w++) {
+                if (array[w].label == data[q]) {
+                  break
+                }
+                while (w == array.length - 1) {
+                  array.push(arraydata)
+                  break
+                }
+              }
+            } else {
+              array.push(arraydata)
+            }
+          }
+          this.entry_name = array
+          //  项目编号
+          // let data1 = []
+          // let array1 = []
+          // data1 = res.data.map(item => {
+          //   return item.f_entry_num;
+          // })
+          // for (let q = 0; q < data1.length; q++) {
+          //   let arraydata = {
+          //     'label': data1[q],
+          //     'value': data1[q]
+          //   }
+          //   if (array1.length != 0) {
+          //     for (let w = 0; w < array1.length; w++) {
+          //       if (array1[w].label == data1[q]) {
+          //         break
+          //       }
+          //       while (w == array1.length - 1) {
+          //         array1.push(arraydata)
+          //         break
+          //       }
+          //     }
+          //   } else {
+          //     array1.push(arraydata)
+          //   }
+          // }
+          // this.entry_num = array1
+        }
+      },
+      async getNum(val) {
+        // 获取项目名称和项目编号
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_apply',
+          condition: this.$login.f.orgs === '重庆盛焰集团' ? "f_entry_name = '" + val + "'" : "f_filiale = '" + this.$login.f.orgs + "'" + " and f_entry_name = '" + val + "'"
+        }
+        let res = await http.load('POST','rs/sql/applysingleTable',{data:data}, {
+          resolveMsg: null,
+          rejectMsg: '获取项目名称和项目编号失败'
+        })
+        for (let i = 0; i < res.data.length; i++) {
+          //  项目编号
+          let data1 = []
+          let array1 = []
+          data1 = res.data.map(item => {
+            return item.f_entry_num;
+          })
+          for (let q = 0; q < data1.length; q++) {
+            let arraydata = {
+              'label': data1[q],
+              'value': data1[q]
+            }
+            if (array1.length != 0) {
+              for (let w = 0; w < array1.length; w++) {
+                if (array1[w].label == data1[q]) {
+                  break
+                }
+                while (w == array1.length - 1) {
+                  array1.push(arraydata)
+                  break
+                }
+              }
+            } else {
+              array1.push(arraydata)
+            }
+          }
+          this.entry_num = array1
+        }
+      },
+      entryChange(val) {
+        console.log("被选中的数据:" + val)
+        this.getNum(val)
+      },
+      orgChange(val) {
+        console.log("被选中的数据:" + val)
+        this.getEntry(val)
       }
     }
   }

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -23,7 +23,7 @@
     <!-- 添加合同 -->
     <addcontract :addcontract="selectdata" v-if="showcontract"></addcontract>
     <!-- 终止报建 -->
-    <stop-install :stopapply="selectdata" v-if="showstop"></stop-install>
+    <stop-install :stopapply="selectdata" v-if="showstop" v-ref:stopdata></stop-install>
     <!-- 领料记录 -->
     <material_recording :infee="selectdata" v-if="show_material"></material_recording>
   </div>
@@ -232,6 +232,8 @@
       },
       // 终止报建
       stopInstall() {
+        // console.log('终止报建数据：' + JSON.stringify())
+        // this.$refs.stopdata.model.f_stop_remarks = ''
         this.$parent.$refs.installselect.clifun(this.selectdata)
         // this.selectdata = row
         this.$parent.clishow= true

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="col-sm-12 auto select-overspread">
+  <div class="col-sm-12 auto select-overspread" v-if="this.infee.f_apply_type != '新用户' || selectdata.f_roster != '有'">
     <div class="auto select-overspread">
       <div class="panel panel-info">
         <div class="panel-heading auto">
@@ -25,7 +25,7 @@
         </div>
       </div>
       <div class="col-sm-3 " v-show="!($login.f.orgs.includes('彩虹'))">
-        <label class="control-label-justify control-label col-sm-4" style=" margin-top: 7px;">合同金额:</label>
+        <label class="control-label-justify control-label col-sm-4" style=" margin-top: 7px;">应收金额:</label>
         <div class="col-sm-8">
             <input class="form-control" style="background-color: #f7fbff;" property="请输入" v-model="model.f_contract_money" readonly/>
         </div>
@@ -243,7 +243,7 @@
       <article slot="modal-body" class="modal-body">
         <div v-if="showpay">
           <div class="from-group">
-            <label>合同金额(元)</label>
+            <label>应收金额(元)</label>
             <input type="text" class="form-control" v-model="model.f_contract_money" readonly>
           </div>
           <div class="from-group">
@@ -274,6 +274,10 @@
             <label>金额大写</label>
             <input type="text" class="form-control" v-model="getCapital" readonly>
           </div>
+          <div class="from-group">
+            <label>票据号</label>
+            <input type="text" class="form-control" v-model="addItem.f_invoice_num">
+          </div>
           <!--<div class="from-group">-->
           <!--<label>缴费类型</label>-->
 
@@ -355,6 +359,9 @@
     </modal>
 
   </div>
+  <div v-if="this.infee.f_apply_type == '新用户' && selectdata.f_roster == '有'">
+    <batch-pay :selectdata="selectdata"></batch-pay>
+  </div>
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
@@ -426,7 +433,8 @@
         chargeitems: this.$appdata.getParam('收费项目'),
         billstyles: this.$appdata.getParam('票据类型'),
         paymenttypes: this.$appdata.getParam('付款方式'),
-        bill: ''  // 票数据
+        bill: '',  // 票数据
+        selectdata: this.infee
       }
     },
     // props: ['infee', 'showfee'],
@@ -642,17 +650,17 @@
           this.$showMessage("不能缴费0元")
         } else {
           //获取购货方信息
-          http = new HttpResetClass()
-          data = {
-            tablename: 't_buyer_info',
-            condition: `f_process_id = '${this.infee.f_process_id}' and f_apply_num = '${this.infee.f_apply_num}'`
-          }
-          let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取购货方信息失败'})
-          this.buyerinfo.rows = res.data
-            if (this.buyerinfo.rows.length < 1 && this.addItem.f_bill_style === '增值税电子发票' && this.$appdata.getSingleValue('默认打印票据') === '是'){
-                this.$showAlert('未找到购买方信息，请去报建功能"购买方信息"中完善购买方信息后再收费','info',2000)
-                return
-            }
+          // http = new HttpResetClass()
+          // data = {
+          //   tablename: 't_buyer_info',
+          //   condition: `f_process_id = '${this.infee.f_process_id}' and f_apply_num = '${this.infee.f_apply_num}'`
+          // }
+          // let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取购货方信息失败'})
+          // this.buyerinfo.rows = res.data
+          //   if (this.buyerinfo.rows.length < 1 && this.addItem.f_bill_style === '增值税电子发票' && this.$appdata.getSingleValue('默认打印票据') === '是'){
+          //       this.$showAlert('未找到购买方信息，请去报建功能"购买方信息"中完善购买方信息后再收费','info',2000)
+          //       return
+          //   }
 
           // 累计缴费金额
           let flag1 = this.accAdd(Number(this.addItem.f_charge_money), Number(this.model.f_cumulative_money))
@@ -695,11 +703,26 @@
               this.close()
             })
 
+          data = {
+            f_userinfo_id: '',
+            f_state: '已收费',
+            f_unaccounts_money: flag2,
+            f_cumulative_money: flag1,
+            f_process_id: this.infee.f_process_id
+          }
+          if (flag2 == 0.00 || flag2 == 0 || flag2 == '') {
+            data.f_state = '已收费'
+          }else {
+            data.f_state = '未结清'
+          }
+          //更改超长记录表
+          await http.load('POST', 'rs/logic/updateBatchSum', {data: data}, {resolveMsg: null, rejectMsg: "更新失败"})
 
           data = {
             f_cumulative_money: flag1,
             f_unaccounts_money: flag2,
-            f_apply_num: this.infee.f_apply_num
+            f_apply_num: this.infee.f_apply_num,
+            f_contract_money: this.model.f_contract_money
           }
           await http.load('POST', 'rs/logic/updatechargemoney', {data: data}, {resolveMsg: null, rejectMsg: "添加累计金额失败"})
             .then((res) => {
@@ -937,18 +960,18 @@
         Object.assign(this.model,this.model, res.data[0])
 
         // 获取补充协议
-        let data2 = {
-          tablename: 't_contract',
-          condition: ` f_contract_type = '补充协议' and f_process_id = '${this.infee.f_process_id}' and f_contract_type = '补充协议'`
-        }
-        //获取补充协议请求
-        await http.load('POST', 'rs/sql/singleTable', {data: data2}, {resolveMsg: null, rejectMsg: '获取补充协议失败'}).then((res2)=>{
-          if(res2.data.length>0){
-            this.showMsg = true
-          }else{
-            this.showMsg = false
-          }
-        })
+        // let data2 = {
+        //   tablename: 't_contract',
+        //   condition: ` f_contract_type = '补充协议' and f_process_id = '${this.infee.f_process_id}' and f_contract_type = '补充协议'`
+        // }
+        // //获取补充协议请求
+        // await http.load('POST', 'rs/sql/singleTable', {data: data2}, {resolveMsg: null, rejectMsg: '获取补充协议失败'}).then((res2)=>{
+        //   if(res2.data.length>0){
+        //     this.showMsg = true
+        //   }else{
+        //     this.showMsg = false
+        //   }
+        // })
 
         data = {
           tablename: 't_charge_record',
@@ -964,12 +987,12 @@
         this.model.rows = res.data
 
         //获取购货方信息
-        data = {
-            tablename: 't_buyer_info',
-            condition: `f_process_id = '${this.infee.f_process_id}' and f_apply_num = '${this.infee.f_apply_num}'`
-        }
-        res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取购货方信息失败'})
-        this.buyerinfo.rows = res.data
+        // data = {
+        //     tablename: 't_buyer_info',
+        //     condition: `f_process_id = '${this.infee.f_process_id}' and f_apply_num = '${this.infee.f_apply_num}'`
+        // }
+        // res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取购货方信息失败'})
+        // this.buyerinfo.rows = res.data
 
 /*
         data = {
@@ -1009,7 +1032,7 @@
           condition: `f_charging_status='有效' and f_process_id = '${this.selectdata.f_process_id}'`
         }
         let res = await http.load('POST', 'rs/sql/getSum', {data: data}, {resolveMsg: null, rejectMsg: '获取缴费金额获取失败'})
-        debugger
+        // debugger
         this.model.f_cumulative_money = res.data[0].f_charge_money
         this.model.f_unaccounts_money = Number(this.model.f_contract_money) - this.model.f_cumulative_money
         return this.model.f_cumulative_money

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

@@ -65,6 +65,7 @@
   // import AppData from '../../../../stores/AppData'
   import * as Util from '../../../Util'
   import co from 'co'
+  import {HttpResetClass} from 'vue-client'
   let gen = function * (self, val, val1) {
     let data ={
       tablename:'t_apply',
@@ -92,7 +93,8 @@
           f_date: Util.toStandardTimeString(),
           f_department: this.$login.f.f_department_name,
           f_operator: this.$login.f.name,
-          f_filiale: this.$login.f.orgs
+          f_filiale: this.$login.f.orgs,
+          f_stop_remarks: ''
         }
       }
     },
@@ -107,6 +109,16 @@
         this.model.f_operat_type = '终止报建'
         this.model.f_state = '有效'
         this.model.f_describe = this.model.f_user_name + '已终止报建'
+        console.log('开始删除')
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/logic/stopApplyDelete', {data: {f_process_id: this.stopapply.f_process_id}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          console.log('返回的数据：', res)
+          if (res.data != null && res.data !== '') {
+            this.$showMessage(res.data)
+          } else {
+            this.$showMessage('删除成功！')
+          }
+        })
         let getGen = gen(this, this.model, this.stopapply)
         co(getGen)
         this.$dispatch('searchcard')