apply-clients 5.0.361 → 6.0.3

package/src/components/build/Install/InstallFee/InstallInfoSelect.vue

@@ -0,0 +1,232 @@
+<template>
+  <div class="d1 flex">
+    <div class="left col-sm-12">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
+          <form novalidate class="" partial>
+            <div class="col-sm-10">
+              <div class="col-sm-2">
+                <div class="col-sm-11">
+                  <input type="text" class="form-control" v-model="model.f_user_name" v-on:keyup.enter="search"
+                         condition="f_user_name like '{}%'" placeholder="用户姓名">
+                </div>
+              </div>
+              <div class="col-sm-2">
+                <div class="col-sm-11">
+                  <input type="text" class="form-control" v-model="model.f_apply_num" v-on:keyup.enter="search"
+                         condition="f_apply_num like '{}%'" placeholder="报建编号">
+                </div>
+              </div>
+              <!-- <div class="col-sm-2">
+                <label for="f_user_name" class="col-sm-6"><nobr> 地址：</nobr></label>
+                <div class="col-sm-6">
+                  <input type="text" class="form-control" v-model="model.f_address" v-on:keyup.enter="search"
+                  condition="f_address like '{}%'" >
+                </div>
+              </div> -->
+              <div class="col-sm-2">
+                <!--<label for="f_user_name" class="col-sm-6"><nobr> 小区：</nobr></label>-->
+                <div class="col-sm-11">
+                  <input type="text" class="form-control" v-model="model.f_residential_area" v-on:keyup.enter="search"
+                         condition="f_residential_area like '{}%'" placeholder="小区">
+                </div>
+              </div>
+              <div class="col-sm-2">
+                <!--<label for="f_user_name" class="col-sm-6"><nobr> 用户类型：</nobr></label>-->
+                <div class="col-sm-11" v-if="this.$login.f.f_fengongsi.includes('西昌')">
+                  <v-select :options="$parent.$parent.fapplytype" placeholder='用户类型' condition="f_user_type  like '{}%'"
+                            v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-11" v-else>
+                  <v-select :options="$parent.$parent.usertype" placeholder='用户类型' condition="f_user_type  like '{}%'"
+                            v-model="model.f_user_type" :value.sync="model.f_user_type" close-on-select>
+                  </v-select>
+                </div>
+              </div>
+              <!--<div class="col-sm-2">-->
+                <!--&lt;!&ndash;<label for="f_user_type" class="col-sm-6"><nobr> 流程状态：</nobr></label>&ndash;&gt;-->
+                <!--<div class="col-sm-12">-->
+                  <!--<v-select :options="$parent.$parent.defnameType" placeholder='流程状态'-->
+                            <!--condition="act.defname  like '%{}%'"-->
+                            <!--v-model="model.defname" :value.sync="model.defname" close-on-select>-->
+                  <!--</v-select>-->
+                <!--</div>-->
+              <!--</div>-->
+              <div class="col-sm-2">
+                <!--<label for="f_apply_type" class="col-sm-6"><nobr> 报装类型：</nobr></label>-->
+                <div class="col-sm-6">
+                  <v-select :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>
+
+            <div class="col-sm-2">
+              <center>
+                <div class="col-sm-10  pull-right">
+                  <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.showpager()">
+                  <span class="glyphicon glyphicon-search"></span>查询</button>
+                </div>
+              </center>
+            </div>
+          </form>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid class="data-grid" is-fixed='false' style="overflow-x:auto">
+          <template partial='head'>
+            <tr class="title">
+              <th>
+                <nobr>序号</nobr>
+              </th>
+              <th>
+                <nobr>当前状态</nobr>
+              </th>
+              <th>
+                <nobr>用户姓名</nobr>
+              </th>
+              <th>
+                <nobr>小区</nobr>
+              </th>
+              <th v-if="!this.$login.f.f_fengongsi.includes('西昌')">
+                <nobr>用户类型</nobr>
+              </th>
+              <th>
+                <nobr>流程状态</nobr>
+              </th>
+              <th>
+                <nobr>报建日期</nobr>
+              </th>
+              <th>
+                <nobr>申请户数</nobr>
+              </th>
+              <th>
+                <nobr>操作</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td  style="text-align: center;">
+                <nobr>{{$index+1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.defname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</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.defname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <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 != '完工'">
+                  <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 v-if="$parent.$parent.$parent.judge(row)">-->
+                      <!--<a href="#" @click="$parent.$parent.$parent.$parent.reducefee(row)">费用减免</a>-->
+                    <!--</li>-->
+                    <li v-if="$parent.$parent.$parent.judge(row)" v-show="!this.$login.f.f_fengongsi.includes('西昌')">
+                      <a href="#" @click="$parent.$parent.$parent.$parent.updatefee(row)">费用变更</a>
+                    </li>
+                    <li v-if="$parent.$parent.$parent.judge(row)&&$parent.$parent.$parent.$login.f.f_fengongsi.includes('彩虹')&&!row.f_apply_type.includes('个')">
+                      <a href="#" @click="$parent.$parent.$parent.$parent.instalfee(row,'预付扣款')">预付扣款</a>
+                    </li>
+                    <li v-if="$parent.$parent.$parent.judge(row)&&row.defname.includes('合同签订')||row.defname.includes('材料计划')
+                    ||row.defname.includes('材料审核')||row.defname.includes('施工报建')||row.defname.includes('竣工验收') ||row.defname.includes('工程施工任务书')||row.defname.includes('资料移交')||row.defname.includes('通气点火')
+                    "  >
+                      <a v-else href="#" @click="$parent.$parent.$parent.$parent.instalfee(row,'报建收费')">报建收费</a>
+                    </li>
+                    <li v-if="$parent.$parent.$parent.judge(row)" v-show="!this.$login.f.f_fengongsi.includes('西昌')">
+                      <a href="#" @click="$parent.$parent.$parent.$parent.bill(row)">打印票据</a>
+                    </li>
+                    <li v-if="$parent.$parent.$parent.judge(row)" v-show="!this.$login.f.f_fengongsi.includes('西昌')">
+                      <a href="#" @click="$parent.$parent.$parent.$parent.contract(row)">补充协议</a>
+                    </li>
+                    <li v-if="$parent.$parent.$parent.judge(row) && $parent.$parent.$parent.$login.f.f_fengongsi.includes('彩虹')">
+                      <a href="#" @click="$parent.$parent.$parent.$parent.preparation(row)">预付款</a>
+                    </li>
+                    <li>
+                      <a href="#" @click="$parent.$parent.$parent.$parent.stopInstall(row)">终止报建</a>
+                    </li>
+                  </ul>
+                </dropdown>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+<script>
+  import {
+    PagedList
+  } from 'vue-client'
+
+  export default {
+    title: '报建业务信息',
+    data() {
+      return {
+        usertype: this.$appdata.getParam('用户类型'),
+        defnameType: this.$appdata.getParam('流程状态'),
+        applytype: this.$appdata.getParam('报装类型'),
+        //西昌 专用
+        fapplytype: this.$appdata.getParam('用户类型'),
+        arr: ['报建登记', '现场勘探', '设计出图'],
+        showbtn: false,
+        model: new PagedList('rs/sql/checkuserfunction', 20, {
+          data: {
+            id: this.$login.f.id,
+            fengongsi: this.$login.f.f_fengongsi
+          }
+        }),
+        condition: ''
+      }
+    },
+    ready() {
+      this.$refs.cp.$refs.cri.search()
+    },
+    methods: {
+      judge(row) {
+        // let flag = false
+        // if (!this.arr.includes(row.defname)) {
+        //   if ((!row.f_actualfee) || (!row.f_total_fee)) { //至少一个不存在
+        //     flag = true
+        //   } else { // 两个都存在
+        //     if (row.f_actualfee < row.f_total_fee) {
+        //       flag = true
+        //     } else {
+        //       flag = false
+        //     }
+        //   }
+        // }
+        let flag = true
+        return flag
+      },
+      clifun(row) {
+        this.$refs.cp.$refs.grid.model.rows = [row]
+        this.$refs.cp.pager = false
+        this.$dispatch('showbtn', row)
+      },
+      showpager() {
+        this.$refs.cp.pager = true
+        this.$dispatch('hiddenbtn')
+      }
+    }
+  }
+</script>

package/src/components/{product/Process → build/Install}/ModifyUserFiles.vue

@@ -153,7 +153,7 @@
     'title': '用户档案',
     data () {
       return {
-        model: new PagedList('rs/sql/singleTable_OrderBy', 30, {items: '"*"', tablename: '"t_userinfo"', orderitem: '"CONVERT(bigint,f_userinfo_id)  desc"'}),
+        model: new PagedList('rs/sql/singleTable_OrderBy', 30, {items: '"*"', tablename: '"t_userinfo"', orderitem: '"CONVERT(int,f_userinfo_id)  desc"'}),
         row: null, // 选择一条用户信息，对其进行修改
         arearow: null, // 新建修改小区使用的数据小区使用
         areainfo: null, // 小区批量建档使用的数据

package/src/components/build/Install/Process/BuildJob.vue

@@ -0,0 +1,242 @@
+<template>
+  <div class="auto select-overspread">
+    <div class="panel panel-info">
+    	<div class="panel-heading">
+    		<h3 class="panel-title">施工</h3>
+    	</div>
+    </div>
+    <validator name="v">
+    <form class="form-horizontal">
+      <div class="col-sm-4 form-group">
+        <label class="control-label col-sm-6">实际开工日期</label>
+        <div class="col-sm-6">
+          <datepicker width="600.76px;"
+                      :value.sync="model.f_project_startdate"
+                      :format="'yyyy-MM-dd'"
+                      v-model="model.f_project_startdate" readonly="readonly"
+                      :show-reset-button="reset">
+           </datepicker>
+        </div>
+      </div>
+      <!--<div class="col-sm-4 form-group" :class="[$v.pprincipal.required ? 'has-error select-error': '']">-->
+        <!--<label class="control-label col-sm-6">工程负责人：</label>-->
+        <!--<div class="col-sm-6">-->
+          <!--<v-select  :is-all-line="true" :value.sync="model.f_project_principal" v-model="model.f_project_principal" v-ref:pprincipal-->
+                    <!--:options='fprojectprincipal' placeholder="全部" close-on-select></v-select>-->
+        <!--</div>-->
+      <!--</div>-->
+      <div class="col-sm-4 form-group">
+        <label class="control-label col-sm-6">工程负责人：</label>
+        <div class="col-sm-6">
+          <input class="form-control" type="text" v-model="model.f_project_principal" readonly/>
+          <!--<v-select  :is-all-line="true" style="hight:200px" :value.sync="model.f_project_principal" v-model="model.f_project_principal" v-ref:pprincipal-->
+                    <!--:options='fprojectprincipal' placeholder="全部" close-on-select></v-select>-->
+        </div>
+      </div>
+      <div class="col-sm-12"></div>
+      <div class="col-sm-4 form-group">
+        <div class="col-sm-5"></div>
+        <div class="col-sm-5">
+          <input type="checkbox" class="" id="checkbox" v-model="model.f_indoor_project" v-validate:f_indoor_project='{required: true }'/>
+          <label for="checkbox" class="font-size" :class="[$v.f_indoor_project.required ? 'text-danger' : '']">户内工程</label>
+        </div>
+      </div>
+      <div class="col-sm-4 form-group">
+        <label class="control-label col-sm-4">户内开工日期：</label>
+        <div class="col-sm-6">
+          <datepicker width="600.76px;"
+                      :value.sync="model.f_indoor_startdate"
+                      :format="'yyyy-MM-dd'"
+                      v-model="model.f_indoor_startdate" readonly="readonly"
+                      :show-reset-button="reset">
+           </datepicker>
+        </div>
+      </div>
+      <div class="col-sm-4 form-group">
+        <label class="control-label col-sm-4">户内完工日期：</label>
+        <div class="col-sm-6">
+          <datepicker width="600.76px;"
+                      :value.sync="model.f_indoor_enddate"
+                      :format="'yyyy-MM-dd'" readonly="readonly"
+                      v-model="model.f_indoor_enddate"
+                      :show-reset-button="reset">
+           </datepicker>
+        </div>
+      </div>
+      <div class="col-sm-4 form-group">
+        <div class="col-sm-5"></div>
+        <div class="col-sm-5">
+          <input type="checkbox" class="" id="checkbox2" v-model="model.f_outdoors_project" v-validate:f_outdoors_project='{required: true }'>
+          <label for="checkbox2" class="font-size" :class="[$v.f_outdoors_project.required ? 'text-danger' : '']">庭院工程</label>
+        </div>
+      </div>
+      <div class="col-sm-4 form-group">
+        <label class="control-label col-sm-4">庭院开工日期：</label>
+        <div class="col-sm-6">
+          <datepicker width="600.76px;"
+                      :value.sync="model.f_outdoors_startdate"
+                      :format="'yyyy-MM-dd'"
+                      v-model="model.f_outdoors_startdate" readonly="readonly"
+                      :show-reset-button="reset">
+           </datepicker>
+        </div>
+      </div>
+      <div class="col-sm-4 form-group">
+        <label class="control-label col-sm-4">庭院完工日期：</label>
+        <div class="col-sm-6">
+          <datepicker width="600.76px;"
+                      :value.sync="model.f_outdoors_enddate"
+                      :format="'yyyy-MM-dd'"
+                      v-model="model.f_outdoors_enddate" readonly="readonly"
+                      :show-reset-button="reset">
+           </datepicker>
+        </div>
+      </div>
+      <div class="col-sm-12 form-group">
+        <label class="control-label col-sm-2">施工备注：</label>
+        <div class="col-sm-9">
+          <textarea class="form-control" rows="3"  v-model="model.f_project_remarks"></textarea>
+        </div>
+      </div>
+      <div class="form-group  col-sm-6">
+        <label class=" col-sm-4 control-label" for="f_filiale">分公司：</label>
+        <div class="col-sm-5" id="f_filiale">
+          <input class="form-control" type="text" v-model="model.f_filiale"  disabled>
+        </div>
+      </div>
+      <div class="col-sm-6 form-group">
+        <label class="control-label col-sm-4">操作日期：</label>
+        <div class="col-sm-5">
+          <input type="text" class="form-control" disabled v-model="model.f_project_date"/>
+        </div>
+      </div>
+      <div class="col-sm-6 form-group">
+        <label class="control-label col-sm-4">部门：</label>
+        <div class="col-sm-5">
+          <input type="text" class="form-control" disabled v-model="model.f_project_department"/>
+        </div>
+      </div>
+      <div class="col-sm-6 form-group">
+        <label class="control-label col-sm-4">操作人：</label>
+        <div class="col-sm-5">
+          <input type="text" class="form-control" disabled v-model="model.f_project_operator"/>
+        </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;">
+          保存
+        </button>
+        <button type="button" @click="commit()" class="btn btn-primary" style="width:80px; margin-left:50px;">
+          提交
+        </button>
+        <button type="button" @click="back()" class="btn btn-warning" style="width:80px; margin-left:50px;">
+          退回
+        </button>
+      </center>
+    </div>
+  </div>
+</template>
+<script>
+  import co from 'co'
+  import  {HttpResetClass} from 'vue-client'
+  import * as Util from '../../../Util'
+  let gen = function * (self, val) {
+    val.f_sub_state = ''
+    val.f_temp_date = Util.toStandardTimeString()
+    let data ={
+      tablename:'t_apply',
+      parameters:val
+    }
+    yield self.$resetpost('rs/logic/save', {data:data})
+     data = {
+      model: {
+        f_processid: self.selectdata.f_process_id,
+      },
+      loginUser: {
+        id:self.$login.f.id,
+        name: self.$login.f.name,
+        ename: self.$login.f.ename
+      },
+      subdep: '提交'
+    }
+    self.$resetpost(`rs/logic/buildjobnext`,
+      {data: data})
+      .then(() => {
+        self.reset()
+      })
+  }
+  export default {
+    title: '施工',
+    data () {
+      return {
+        fprojectprincipal: this.$appdata.getParam('工程负责人'),
+        model: {
+          actid: ''
+        }
+      }
+    },
+    props: ['selectdata'],
+    ready () {
+      this.$nextTick(() => {
+        this.model = Object.assign({}, this.model, this.selectdata)
+        this.model.f_project_date = this.$login.toStandardDateString(),
+        this.model.f_project_department = this.$login.f.f_parentname,
+        this.model.f_project_operator = this.$login.f.name
+      })
+    },
+    methods: {
+      back() {
+
+        let data = {
+          model: {
+            f_processid: this.selectdata.f_process_id,
+          },
+          loginUser: {
+            id: this.$login.f.id,
+            name: this.$login.f.name,
+            ename: this.$login.f.ename
+          },
+          subdep: '退回'
+        }
+        this.$resetpost(`rs/logic/buildjobnext`,
+          {data: data})
+          .then(() => {
+            this.reset()
+          })
+      },
+     async confirm() {
+        let http = new HttpResetClass()
+        // this.model.f_sub_state = '完成'
+       let data ={
+         tablename:'t_apply',
+         parameters:this.model
+       }
+        await  http.load('POST','rs/logic/save', {data:data})
+                .then(() => {
+                  this.reset()
+          })
+      },
+      commit () {
+        let getGen = gen(this, this.model)
+        co(getGen)
+      },
+      reset () {
+        this.$dispatch('close')
+        this.$dispatch('selfsearch')
+      }
+    },
+    watch: {
+      'selectdata'() {
+        this.$nextTick(() => {
+          this.model = Object.assign({}, this.model, this.selectdata)
+          this.model.f_project_date = this.$login.toStandardDateString(),
+          this.model.f_project_department = this.$login.f.f_parentname,
+          this.model.f_project_operator = this.$login.f.name
+        })
+      }
+    }
+  }
+</script>