apply-clients 4.1.66 → 4.1.70

package/package.json

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

package/src/apply.js

@@ -51,6 +51,8 @@ export default function () {
 
   // 地址管理
   Vue.component('apply-address-userinfo-management', (resolve) => { require(['./components/product/Process/Processes/addressAndUserinfoManagement'], resolve) })
+  // 用户操作
+  Vue.component('apply-address-userinfo-management-pro', (resolve) => { require(['./components/product/Process/Processes/addressAndUserinfoManagementPro'], resolve) })
   // 施工安装明细
   Vue.component('installation-details', (resolve) => { require(['./components/product/Process/Processes/InstallationDetails'], resolve) })
   // 收费管理
@@ -59,7 +61,10 @@ export default function () {
   // 补充协议
   Vue.component('supplemental-agreement', (resolve) => { require(['./components/product/Process/Processes/supplementalAgreement'], resolve) })
   Vue.component('test', (resolve) => { require(['./components/product/Test'], resolve) })
-
+  // 设备信息
+  Vue.component('devices-details', (resolve) => { require(['./components/product/Process/Processes/devicesDetails'], resolve) })
+  // 表具点火信息
+  Vue.component('apply-file-user-fire-info', (resolve) => { require(['./components/product/Process/Processes/UserFireInfo'], resolve) })
   /** VueUtils **/
   Vue.component('back-page', (resolve) => { require(['./components/product/VueUtils/ToolsPage'], resolve) })
   Vue.component('tree2', (resolve) => { require(['./components/product/VueUtils/Tree'], resolve) })

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

@@ -121,7 +121,6 @@
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_entry_name}}</nobr>
-              <nobr>{{row.f_entry_name}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_contract_number}}</nobr>

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

@@ -1,176 +1,176 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged :pager="false">
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-          <div class="row">
-            <div class="form-group col-sm-12 button-range">
-              <button class="button_search button_spacing" @click="search()">查询</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-12">
-              <label class="font_normal_body">&emsp;</label>
-              <input type="text" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="search" condition="f_user_name like '%{}%'" placeholder='联系人'>
-            </div>
-            <div class="form-group col-sm-12">
-              <label class="font_normal_body">&emsp;</label>
-              <input type="text" class="input_search" v-model="model.f_phone"
-                     v-on:keyup.enter="search" condition="f_phone like '%{}%'" placeholder='电话号码'>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
-        <template partial='head'>
-          <tr class="title">
-            <th colspan="2" style="white-space: nowrap;">已终止报建工程</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr>
-            <td style="text-align: center;">{{row.f_user_name}}</td>
-            <td style="text-align: center;">
-              <dropdown>
-                <button @click="" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
-                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
-                </button>
-              </dropdown>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-<!--      <div partial="list" style="overflow: auto">-->
-<!--        <div class="panel panel-default auto" v-for="item in model.rows">-->
-<!--          <div class="panel-heading auto" style="background-color: #E8F4FF" @click="$parent.$parent.showTable(item)">-->
-<!--            {{item.f_user_name}}-->
-<!--            <div style="float: right">-->
-<!--              <dropdown class="auto">-->
-<!--                <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">-->
-<!--                  <span class="glyphicon glyphicon-th-list"></span>-->
-<!--                </button>-->
-<!--                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right" style=" min-width: 60px;">-->
-<!--                  <li>-->
-<!--                    <a href="#" @click.stop="$parent.$parent.operate(item)">撤销</a>-->
-<!--                  </li>-->
-<!--                </ul>-->
-<!--              </dropdown>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--          <table class="table" v-if="$parent.$parent.tableShow(item)">-->
-<!--            <tr>-->
-<!--              <td><b>终止原因</b></td>-->
-<!--              <td>-->
-<!--                  <span data-toggle="tooltip" data-placement="left" :title="item.f_stop_remarks">-->
-<!--                    {{item.f_stop_remarks.length > 5 ? item.f_stop_remarks.substring(0,5) + '...' : item.f_stop_remarks.length}}-->
-<!--                  </span>-->
-<!--              </td>-->
-<!--            </tr>-->
-<!--            <tr>-->
-<!--              <td><b>流程节点</b></td>-->
-<!--              <td>-->
-<!--                  <span data-toggle="tooltip" data-placement="left" :title="item.defname">-->
-<!--                    {{item.defname.length > 5 ? item.defname.substring(0,5) + '...' : item.defname}}-->
-<!--                  </span>-->
-<!--              </td>-->
-<!--            </tr>-->
-<!--            <tr>-->
-<!--              <td><b>操作人</b></td>-->
-<!--              <td>-->
-<!--                  <span data-toggle="tooltip" data-placement="left" :title="item.f_operator">-->
-<!--                    {{item.f_operator.length > 5 ? item.f_operator.substring(0,5) + '...' : item.f_operator}}-->
-<!--                  </span>-->
-<!--              </td>-->
-<!--            </tr>-->
-<!--            <tr>-->
-<!--              <td><b>操作部门</b></td>-->
-<!--              <td>-->
-<!--                  <span data-toggle="tooltip" data-placement="left" :title="item.f_department">-->
-<!--                    {{item.f_department.length > 5 ? item.f_department.substring(0,5) + '...' : item.f_department}}-->
-<!--                  </span>-->
-<!--              </td>-->
-<!--            </tr>-->
-<!--            <tr>-->
-<!--              <td><b>操作日期</b></td>-->
-<!--              <td>-->
-<!--                  <span data-toggle="tooltip" data-placement="left" :title="item.f_date">-->
-<!--                    {{new Date(item.f_date).Format('yyyy-MM-dd')}}...-->
-<!--                  </span>-->
-<!--              </td>-->
-<!--            </tr>-->
-<!--          </table>-->
-<!--        </div>-->
-<!--      </div>-->
-    </criteria-paged>
-  </div>
-</template>
-<script>
-  /**
-   *操作记录信息
-   */
-  import {HttpResetClass} from 'vue-client'
-  import { PagedList } 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: '操作汇总',
-    data () {
-      return {
-        model: new PagedList('rs/sql/get2StopApply', 9999999, {
-          data: {
-            id: this.$login.f.id,
-            orgid: this.$login.f.orgid
-          }
-        }),
-        row: null, // 当前点击的数据
-        criteriaShow: false // 控制查询条件
-      }
-    },
-    props: {
-    },
-    ready () {
-      this.$refs.paged.$refs.cri.search()
-    },
-    methods: {
-      // 控制查询
-      hidden () {
-        this.criteriaShow = !this.criteriaShow
-      },
-      // 当前点击的卡片数据
-      showTable (row) {
-        this.row = row
-      },
-      // 判断是否显示详细信息
-      tableShow (row) {
-        return this.row === row
-      },
-      // 点击撤销
-      operate (row) {
-        this.$dispatch('operate', row)
-      }
-    },
-    watch: {
-    }
-  }
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="form-group col-sm-12 button-range">
+              <button class="button_search button_spacing" @click="search()">查询</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-12">
+              <label class="font_normal_body">&emsp;</label>
+              <input type="text" class="input_search" v-model="model.f_user_name"
+                     v-on:keyup.enter="search" condition="f_user_name like '%{}%'" placeholder='联系人'>
+            </div>
+            <div class="form-group col-sm-12">
+              <label class="font_normal_body">&emsp;</label>
+              <input type="text" class="input_search" v-model="model.f_phone"
+                     v-on:keyup.enter="search" condition="f_phone like '%{}%'" placeholder='电话号码'>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr class="title">
+            <th colspan="2" style="white-space: nowrap;">已终止报建工程</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align: center;">{{row.f_user_name}}</td>
+            <td style="text-align: center;">
+              <dropdown>
+                <button @click="" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
+                </button>
+              </dropdown>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+<!--      <div partial="list" style="overflow: auto">-->
+<!--        <div class="panel panel-default auto" v-for="item in model.rows">-->
+<!--          <div class="panel-heading auto" style="background-color: #E8F4FF" @click="$parent.$parent.showTable(item)">-->
+<!--            {{item.f_user_name}}-->
+<!--            <div style="float: right">-->
+<!--              <dropdown class="auto">-->
+<!--                <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">-->
+<!--                  <span class="glyphicon glyphicon-th-list"></span>-->
+<!--                </button>-->
+<!--                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right" style=" min-width: 60px;">-->
+<!--                  <li>-->
+<!--                    <a href="#" @click.stop="$parent.$parent.operate(item)">撤销</a>-->
+<!--                  </li>-->
+<!--                </ul>-->
+<!--              </dropdown>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--          <table class="table" v-if="$parent.$parent.tableShow(item)">-->
+<!--            <tr>-->
+<!--              <td><b>终止原因</b></td>-->
+<!--              <td>-->
+<!--                  <span data-toggle="tooltip" data-placement="left" :title="item.f_stop_remarks">-->
+<!--                    {{item.f_stop_remarks.length > 5 ? item.f_stop_remarks.substring(0,5) + '...' : item.f_stop_remarks.length}}-->
+<!--                  </span>-->
+<!--              </td>-->
+<!--            </tr>-->
+<!--            <tr>-->
+<!--              <td><b>流程节点</b></td>-->
+<!--              <td>-->
+<!--                  <span data-toggle="tooltip" data-placement="left" :title="item.defname">-->
+<!--                    {{item.defname.length > 5 ? item.defname.substring(0,5) + '...' : item.defname}}-->
+<!--                  </span>-->
+<!--              </td>-->
+<!--            </tr>-->
+<!--            <tr>-->
+<!--              <td><b>操作人</b></td>-->
+<!--              <td>-->
+<!--                  <span data-toggle="tooltip" data-placement="left" :title="item.f_operator">-->
+<!--                    {{item.f_operator.length > 5 ? item.f_operator.substring(0,5) + '...' : item.f_operator}}-->
+<!--                  </span>-->
+<!--              </td>-->
+<!--            </tr>-->
+<!--            <tr>-->
+<!--              <td><b>操作部门</b></td>-->
+<!--              <td>-->
+<!--                  <span data-toggle="tooltip" data-placement="left" :title="item.f_department">-->
+<!--                    {{item.f_department.length > 5 ? item.f_department.substring(0,5) + '...' : item.f_department}}-->
+<!--                  </span>-->
+<!--              </td>-->
+<!--            </tr>-->
+<!--            <tr>-->
+<!--              <td><b>操作日期</b></td>-->
+<!--              <td>-->
+<!--                  <span data-toggle="tooltip" data-placement="left" :title="item.f_date">-->
+<!--                    {{new Date(item.f_date).Format('yyyy-MM-dd')}}...-->
+<!--                  </span>-->
+<!--              </td>-->
+<!--            </tr>-->
+<!--          </table>-->
+<!--        </div>-->
+<!--      </div>-->
+    </criteria-paged>
+  </div>
+</template>
+<script>
+  /**
+   *操作记录信息
+   */
+  import {HttpResetClass} from 'vue-client'
+  import { PagedList } 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: '操作汇总',
+    data () {
+      return {
+        model: new PagedList('rs/sql/get2StopApply', 9999999, {
+          data: {
+            id: this.$login.f.id,
+            orgid: this.$login.f.orgid
+          }
+        }),
+        row: null, // 当前点击的数据
+        criteriaShow: false // 控制查询条件
+      }
+    },
+    props: {
+    },
+    ready () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    methods: {
+      // 控制查询
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      // 当前点击的卡片数据
+      showTable (row) {
+        this.row = row
+      },
+      // 判断是否显示详细信息
+      tableShow (row) {
+        return this.row === row
+      },
+      // 点击撤销
+      operate (row) {
+        this.$dispatch('operate', row)
+      }
+    },
+    watch: {
+    }
+  }
+</script>