apply-clients 3.3.46 → 3.3.47

package/src/components/android/Process/Processes/AppBuildSign.vue

@@ -1,5 +1,5 @@
 <template>
-  <app-sign></app-sign>
+  <app-sign @sign-success="signSuccess" :file-path="selectdata.f_construction_sign" @sign-clean="signClean"></app-sign>
 </template>
 <script>
 import {getNowDate,isEmpty} from '../../../Util'
@@ -25,6 +25,14 @@ export default {
     console.log('===========施工签字================')
   },
   methods: {
+    signClean () {
+      this.selectdata.f_construction_sign = null
+    },
+    signSuccess (fileUrl) {
+      console.log('==============签字回调==================')
+      console.log(fileUrl)
+      this.selectdata.f_construction_sign = fileUrl
+    }
   },
   events: {
   },

package/src/components/product/Print/BuildOrder/buildOrderList.vue

@@ -0,0 +1,264 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+          <div class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">组织机构：</label>
+                <res-select
+                  restype='organization'
+                  :initresid='$parent.$parent.curorgid'
+                  @res-select="$parent.$parent.getorg"
+                  is-mul="false"
+                ></res-select>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">工程编号：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_apply_num = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户名称：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='客户名称' v-model="model.f_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_user_name = '{}'">
+              </div>
+              <div class="form-group col-sm-3 button-range">
+                <button class="button_export button_spacing" @click="$parent.$parent.batchPrint()">批量打印</button>
+                <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">电&emsp;&emsp;话：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='电话' v-model="model.f_phone"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_phone = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">地&emsp;&emsp;址：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='地址' v-model="model.f_address"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_address like '%{}%'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">安装单位：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='安装单位' v-model="model.f_construction_unit"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_construction_unit = '{}'">
+              </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 00:00:00'"
+                            :show-reset-button="true"
+                            condition="f_construction_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 23:59:59'"
+                            :show-reset-button="true"
+                            condition="f_construction_date <= '{}'">
+                </datepicker>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" optional partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>工程编号</th>
+              <th>客户名称</th>
+              <th>电话</th>
+              <th>地址</th>
+              <th>安装单位</th>
+              <th>安装时间</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{$index+1}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_apply_num}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_user_name}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_phone}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_address}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_construction_unit}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_construction_date}}</font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+
+      <modal :show.sync="showPrint" title="打印预览" v-ref:modal :backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="colseModal()"><span>&times;</span></button>
+          <h4 class="modal-title">打印预览</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <print-build-order :selectdata="selectdata" :type="type" v-ref:print></print-build-order>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" @click="print()">打印</button>
+        </footer>
+      </modal>
+
+      <modal :show.sync="showProgress" v-ref:progress :backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <h4 class="modal-title">发送打印指令中,请耐心等待...</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <div class="progress" style="margin: 20px">
+            <div class="progress-bar progress-bar-success progress-bar-striped active" :style="{width: percent}">
+              {{ percent }}
+            </div>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+        </footer>
+      </modal>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '安装项目',
+  data () {
+    return {
+      model: new PagedList('rs/sql/buildOrderList', 30, null),
+      criteriaShow: false,
+      curorgid: [this.$login.f.orgid],
+      selectdata: null,
+      showPrint: false,
+      showProgress: false,
+      percent: 0,
+      type: 'PREVIEW'
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    async batchPrint () {
+      let selectPrint = this.$refs.cp.$refs.grid.getRowData()
+      if (selectPrint.length > 0) {
+        let res = await this.$showMessage(`当前数据条数: ${selectPrint.length}, 条数过大时打印时间可能会过长, 是否确认打印?`)
+        if (res == 'confirm') {
+          this.showProgress = true
+          for (let i = 0; i < selectPrint.length; i++) {
+              this.type = 'PRINT'
+              await this.getData(selectPrint[i])
+              this.print()
+              this.percent = this.getPercent(i, selectPrint.length)
+              console.log('-------------进度-----------')
+              console.log(this.percent)
+          }
+          this.showProgress = false
+          this.percent = 0
+          this.$refs.cp.$refs.grid.selectInit()
+        }
+      } else {
+        this.$showAlert('请选择要打印的单子', 'warning', 3000)
+      }
+    },
+    getPercent (num, total){
+      num = parseFloat(num);
+      total = parseFloat(total);
+      if (isNaN(num) || isNaN(total)) {
+        return "-";
+      }
+      return total <= 0? "0%" : Math.round((num / total) * 10000) / 100.0 + "%";
+    },
+    print () {
+      this.$refs.print.print()
+    },
+    colseModal () {
+      this.showPrint = false
+      this.selectdata = null
+    },
+    async click (row) {
+      this.type = 'PREVIEW'
+
+      this.getData(row)
+
+      this.showPrint = true
+    },
+    async getData (row) {
+      this.selectdata = null
+
+      let http = new HttpResetClass()
+      let data = {
+        f_process_id: row.f_process_id,
+        actid: row.actid
+      }
+      let res = await http.load('POST', 'rs/sql/getBuildOrder', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '获取施工单失败！！！'
+      })
+
+      this.selectdata = res.data[0]
+    },
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = ''
+      })
+    },
+    searchCondition (args) {
+      args.condition = args.condition + ` and u.f_orgid = '${this.curorgid[0]}'`
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.search()
+    }
+  },
+  computed: {
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/src/components/product/Print/BuildOrder/printBuildOrder.vue

@@ -0,0 +1,153 @@
+<template>
+  <style id="printBuildOrderStyle">
+    td{
+      height: 30px;
+      text-align: center;
+    }
+    table{
+      margin: auto;
+      width: 100%;
+      border-collapse:collapse;
+      border: 1px solid black;
+    }
+    h1,h2,h3,h4,h5,h6 {
+      text-align: center;
+    }
+    .sign {
+      vertical-align: top;
+      padding: 10px;
+    }
+    .material {
+      text-align: left;
+      vertical-align: top;
+      padding: 10px;
+    }
+  </style>
+
+  <div id="printBuildOrder">
+    <h2><span style="letter-spacing: 15px">施工安装通知单</span></h2>
+    <table border="1">
+      <tr>
+        <td>用户姓名</td>
+        <td>{{ selectdata.f_user_name }}</td>
+        <td>报装编号</td>
+        <td>{{ selectdata.f_apply_num }}</td>
+        <td>电&emsp;&emsp;&emsp;&emsp;话</td>
+        <td>{{ selectdata.f_phone }}</td>
+      </tr>
+      <tr>
+        <td>用户地址</td>
+        <td colspan="3">{{ selectdata.f_address }}</td>
+        <td>施工安装时间</td>
+        <td>{{ selectdata.f_construction_date }}</td>
+      </tr>
+      <tr>
+        <td>安装项目</td>
+        <td>{{ parse }}</td>
+        <td>通知时间</td>
+        <td>{{ selectdata.sendtime }}</td>
+        <td>施工安装单位</td>
+        <td>{{ selectdata.f_construction_unit }}</td>
+      </tr>
+      <tr>
+        <td>表号</td>
+        <td colspan="2">{{ selectdata.f_meternumber }}</td>
+        <td>表封号</td>
+        <td colspan="2">{{ selectdata.f_metertitles }}</td>
+      </tr>
+      <tr>
+        <td colspan="6" class="material">
+          <p style="margin: 0px 0px 10px 0px">施工安装情况</p>
+          <p style="margin: 0px 0px 10px 0px">{{ selectdata.f_material }}</p>
+<!--          <p v-for="item in selectdata.onetomany[0].rows" style="width: auto;display: inline-block;margin: 0px 15px 5px 0px">-->
+<!--            <span style="margin-right: 10px">{{$index + 1}}、{{item.f_material_name}}{{item.f_material_style}}</span>{{item.f_material_number}}{{item.f_material_unit}}-->
+<!--          </p>-->
+        </td>
+      </tr>
+      <tr style="height: 80px">
+        <td colspan="2" class="sign">施工安装单位（签字）</td>
+        <td colspan="2" class="sign">工程验收（签字）</td>
+        <td colspan="2" class="sign">用户（签字）</td>
+      </tr>
+      <tr>
+        <td>备&emsp;&emsp;注</td>
+        <td colspan="5">{{ selectdata.f_construction_remarks }}</td>
+      </tr>
+    </table>
+  </div>
+
+  <print-element v-show="false" v-ref:print id='printBuildOrder' styleid='printBuildOrderStyle'
+                 top='10' left='30' width='100%' height='100%' :type="type">
+  </print-element>
+
+</template>
+
+<script>
+import { isEmpty } from '../../../Util'
+import {HttpResetClass} from "vue-client";
+Date.prototype.Format = function (fmt) {
+  var o = {
+    "M+": this.getMonth() + 1, //月份
+    "d+": this.getDate(), //日
+    "H+": this.getHours(), //小时
+    "m+": this.getMinutes(), //分
+    "s+": this.getSeconds(), //秒
+    "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+    "S": this.getMilliseconds() //毫秒
+  };
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+  for (var k in o)
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+  return fmt;
+}
+export default {
+  title: '施工安装通知单',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    type: {
+      type: String
+    }
+  },
+  data () {
+    return {
+      showModal: false,
+      userfile: null
+    }
+  },
+  ready () {
+  },
+  methods: {
+    print () {
+      this.$refs.print.PrintTable()
+    }
+  },
+  computed: {
+    parse () {
+      return JSON.parse(this.selectdata.f_install_project).toString()
+    },
+    orgs () {
+      return this.$login.f.orgs
+    }
+  }
+}
+</script>
+
+<style scoped>
+.control-label-justify {
+  display: inline-block;
+  vertical-align: top;
+  width: 130px;
+  text-align: justify;
+  font-family: PingFang-SC-Bold;
+}
+
+.control-label-justify::after {
+  content: "";
+  display: inline-block;
+  width: 100%;
+  overflow: hidden;
+  height: 0;
+}
+</style>

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

@@ -122,6 +122,18 @@
                             condition="f_apply_date <= '{}'">
                 </datepicker>
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">稍后处理：</label>
+                <v-select
+                  v-model="model.f_is_later"
+                  placeholder='稍后处理'
+                  condition="f_is_later = '{}'"
+                  :value.sync="model.f_is_later"
+                  :options='$parent.$parent.laterList'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </div>
             </div>
           </div>
       </criteria>
@@ -139,7 +151,7 @@
             <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'>
@@ -177,18 +189,19 @@
             <td @click="$parent.$parent.$parent.click(row)" :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_date}}</font></nobr>
             </td>
-<!--            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" 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 :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" 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>
+                    <a href="#" @click="$parent.$parent.$parent.later(row)" v-if="row.f_is_later !== '是'">稍后处理</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
           </tr>
         </template>
       </data-grid>
@@ -257,7 +270,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
         defnames: [{label: '全部', value: ''}], // 流程节点
         applyNatures: [{label: '全部', value: ''}], // 报建性质
         criteriaShow: false,
-        showFile: false
+        showFile: false,
+        laterList: [
+          {label: '全部', value: ''},
+          {label: '是', value: '是'},
+          {label: '否', value: '否'}
+        ]
       }
     },
     ready () {
@@ -265,6 +283,13 @@ import {HttpResetClass, PagedList} from 'vue-client'
       this.search()
     },
     methods: {
+      later (row) {
+        this.$showMessage('您确定要将此任务加入稍后处理吗？', ['confirm']).then((res) => {
+          if (res === 'confirm') {
+            this.$dispatch('later', row)
+          }
+        })
+      },
       closeFile () {
         this.showFile = false
         // 将选的文件清空

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

@@ -95,6 +95,15 @@
         })
 
       },
+      async 'later' (row) {
+        row.f_is_later = '是'
+        let res = await this.$resetpost(
+          'rs/entity/t_apply',
+          row
+        )
+
+        this.$refs.query.loadPage()
+      },
       // 初始化
       async 'apply' (val) {
         this.showtotal = false