apply-clients 3.0.7-136 → 3.0.7-137

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.7-136",
+  "version": "3.0.7-137",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -93,7 +93,7 @@
     "system-clients": "3.2.2",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "1.22.33-12",
+    "vue-client": "1.24.32",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/apply.js

@@ -63,6 +63,8 @@ export default function () {
   Vue.component('function-service-control', (resolve) => { require(['./components/product/Function/Service/FunctionServiceControl'], resolve) })
 // 终止报建业务
   Vue.component('stop-install', (resolve) => { require(['./components/product/Function/functions/StopInstall'], resolve) })
+  //退费
+  Vue.component('refund-install', (resolve) => { require(['./components/product/Function/functions/RefundInstall'], resolve) })
 // 报建业务信息
   Vue.component('installinfoselect', (resolve) => { require(['./components/product/Function/InstallInfoSelect'], resolve) })
 // 报建收费
@@ -143,4 +145,8 @@ export default function () {
   Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
   // 汇总查询入口 src/components/product/Statistics/ApplyStatisticsROOT.vue
   Vue.component('apply-statistics-root', (resolve) => { require(['./components/product/Statistics/ApplyStatisticsROOT'], resolve) })
+
+  /** VueUtils **/
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
+  Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/HighMeter'], resolve) })
 }

package/src/components/Util.js

@@ -2,6 +2,10 @@ import Vue from 'vue'
 // 登录后获取的所有数据，需要自行获取
 export var f
 
+export function isEmpty (str) {
+  return str === undefined || str === null || str.toString().trim() === ''
+}
+
 export function getAttendanceState (item, timeToWork, timeToGo) {
   item.f_state = ''
   if (!item.f_signin_time || !item.f_knockoff_time) {

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

@@ -50,6 +50,13 @@
                   </v-select>
                 </div>
               </div>
+              <div class="form-group col-sm-2">
+                <div class="col-sm-12">
+                <v-select placeholder='报建状态' :options="$parent.$parent.bjstate" width="100%" :value-single="true"
+                          v-model="model.f_state" :value.sync="model.f_state" close-on-select condition="u.f_state='{}'" >
+                </v-select>
+                </div>
+              </div>
               <div class="form-group col-sm-2">
                 <datepicker id="startDate" placeholder="开始日期"
                             v-model="model.startDate"
@@ -117,6 +124,9 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
+              <th>
+                <nobr>报建状态</nobr>
+              </th>
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -163,6 +173,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_apply_type}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
@@ -205,6 +218,7 @@
         refreshed:true,
         usertype: this.$appdata.getParam('用户类型'),
         defnameType: this.$appdata.getParam('流程状态'),
+        bjstate: [{label:"全部",value:''},...this.$appdata.getParam('报建状态')],
         applytype: [{label:"全部",value:''},...this.$appdata.getParam('报建类型')],
         //中燃 专用
         fapplytype: this.$appdata.getParam('用户类型'),
@@ -222,7 +236,7 @@
           {label: '全部', value: ''},
           {label: '是', value: '是'},
           {label: '否', value: '否'}
-        ]
+        ],
       }
     },
     ready() {

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

@@ -24,6 +24,8 @@
     <addcontract :addcontract="selectdata" v-if="showcontract"></addcontract>
     <!-- 终止报建 -->
     <stop-install :stopapply="selectdata" v-if="showstop"></stop-install>
+    <!-- 退费 -->
+    <refund-install :refundapply="selectdata" v-if="showsrefund"></refund-install>
     <!-- 领料记录 -->
     <material_recording :infee="selectdata" v-if="show_material"></material_recording>
   </div>
@@ -46,6 +48,7 @@
         showinfee: false, // 报建收费
         showprestorefee: false, // 开发商预存报建收费
         showstop: false, // 终止报建
+        showsrefund: false, // 退费
         showbill: false, // 打印票据
         showpreparation: false, // 预付款
         show_material:false,//报建材料
@@ -69,7 +72,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -91,7 +94,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -112,7 +115,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -133,7 +136,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -154,7 +157,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -174,7 +177,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -195,7 +198,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showbill = false
@@ -214,7 +217,7 @@
         this.showmaterialmessage = false
         this.showbuyer = false
         this.showview = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -244,7 +247,7 @@
         this.showbill = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showcontract = false
         this.showpreparation = false
@@ -252,7 +255,26 @@
         this.show_material = false
       },
 
+      RefundInstall() {
+        this.$parent.$refs.installselect.clifun(this.selectdata)
+        // this.selectdata = row
+        this.$parent.clishow= true
+        this.$parent.show = false
 
+        this.showreceivebatch = false
+        this.showmaterialmessage = false
+        this.showbuyer = false
+        this.showview = false
+        this.showbill = false
+        this.showinfee = false
+        this.showprestorefee = false
+        this.showsrefund = true
+        this.showreducefee = false
+        this.showcontract = false
+        this.showpreparation = false
+        this.showstop = false
+        this.show_material = false
+      },
 
       // json配置数据处理 比如下拉框的options
       initializtion() {
@@ -292,6 +314,9 @@
           if(this.funcdata.title==='终止报建'){
             this.stopInstall()
           }
+          if(this.funcdata.title==='退费'){
+            this.RefundInstall()
+          }
           if(this.funcdata.title==='预付扣款'){
             this.instalfee('预付扣款')
           }

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

@@ -0,0 +1,129 @@
+<template>
+  <div class="col-sm-12 auto select-overspread">
+    <div class="auto select-overspread">
+      <div class="panel panel-info">
+        <div class="panel-heading auto">
+          <h3 class="panel-title">退费</h3>
+        </div>
+      </div>
+    </div>
+    <validator name="v">
+      <form class="horizontal" style="padding-top: 50px;">
+        <div class="form-group col-sm-12">
+          <div class="col-sm-2">
+            <label class="control-label col-sm-12">退费金额：</label>
+          </div>
+          <div class="col-sm-10">
+            <input class="form-control" rows="3" v-model="model.f_refund_amount"></input>
+          </div>
+        </div>
+
+        <div class="form-group col-sm-12">
+          <div class="col-sm-2">
+            <label class="control-label col-sm-12">退费原因：</label>
+          </div>
+          <div class="col-sm-10">
+            <textarea class="form-control" rows="3" v-model="model.f_refund_amount_reason"></textarea>
+          </div>
+        </div>
+        <div style="height:200px;"></div>
+        <div class="form-group col-sm-12">
+          <div class="col-sm-6">
+            <label class="control-label col-sm-4">分公司：</label>
+            <div class="col-sm-8">
+              <input class="form-control" type="text" v-model="model.f_filiale"  disabled>
+            </div>
+          </div>
+          <div class="col-sm-6">
+            <label class="control-label col-sm-4">操作日期：</label>
+            <div class="col-sm-8">
+              <input class="form-control" type="text" v-model="model.f_date"  disabled>
+            </div>
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <div class="col-sm-6">
+            <label class="control-label col-sm-4">部门：</label>
+            <div class="col-sm-8">
+              <input class="form-control" type="text" v-model="model.f_department"  disabled>
+            </div>
+          </div>
+          <div class="col-sm-6">
+            <label class="control-label col-sm-4">操作人：</label>
+            <div class="col-sm-8">
+              <input class="form-control" type="text" v-model="model.f_operator"  disabled>
+            </div>
+          </div>
+        </div>
+      </form>
+    </validator>
+    <div class="from-group col-sm-12">
+      <center>
+        <button type="button" @click="confirm()" class="btn btn-primary" style="width:80px; margin-left:50px;" :disabled="$v.invalid">
+          保存
+        </button>
+      </center>
+    </div>
+  </div>
+</template>
+<script>
+  // import AppData from '../../../../stores/AppData'
+  import * as Util from '../../../Util'
+  import co from 'co'
+  let gen = function * (self, val, val1) {
+    // let data ={
+    //   tablename:'t_apply',
+    //   parameters:val1
+    // }
+    // yield self.$resetpost('rs/logic/save', {data:data})
+    // delete val.id
+    // // val.f_cancel_reason = self.stopapply.f_process_id
+    // val.processid = self.refundapply.f_process_id
+    // val.f_operator = self.$login.f.name
+    // data ={
+    //   tablename:'t_apply',
+    //   parameters:val
+    // }
+    // self.$resetpost('rs/logic/save', {data:data})
+    //   .then(() => {
+        self.workflow()
+      // })
+  }
+  export default {
+    title: '退费',
+    data () {
+      return {
+        model: {
+          f_date: Util.toStandardTimeString(),
+          f_department: this.$login.f.f_department_name,
+          f_operator: this.$login.f.name,
+          f_filiale: this.$login.f.orgs
+        }
+      }
+    },
+    props: ['refundapply'],
+    methods: {
+      confirm () {
+        this.model = Object.assign({}, this.refundapply, this.model)
+        this.model.id = this.refundapply.id
+        // this.model.f_jmhj_cost= this.model.f_fee
+        //   this.stopapply.f_state = '退费'
+        this.model.applyid = this.refundapply.id
+        this.model.f_operat_type = '退费'
+        this.model.f_state = '有效'
+        this.model.f_describe = this.model.f_user_name + '已退费'
+        let getGen = gen(this, this.model, this.refundapply)
+        co(getGen)
+        this.$dispatch('searchcard')
+        this.$dispatch('hiddenbtn')
+      },
+      workflow () {
+        // this.$post(`rs/workflow/stop/${this.stopapply.actid}/${this.$login.f.name}/${this.$login.f.id}`, [{data: `{id: ${this.model.actid}}`}])
+        this.$resetpost('rs/logic/refundapply', {data: this.model})
+          .then((res) => {
+            // this.reset()
+          })
+      },
+    }
+  }
+</script>