safecheck-client 3.0.32-19 → 3.0.32-20

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.32-19",
+  "version": "3.0.32-20",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",
@@ -103,13 +103,13 @@
     "sketch-vue3": "^1.0.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.1-10",
+    "system-clients": "3.2.98",
     "system-phone": "1.2.100",
     "telephone-clients": "1.1.27",
     "terser-webpack-plugin-legacy": "^1.2.5",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.93",
+    "vue-client": "1.24.160",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/filiale/fugou/pc/CheckBookDetails.vue

@@ -3,7 +3,7 @@
     <validator name='v'>
       <form class="form-horizontal" novalidate>
         <ul class="nav nav-tabs" style="margin-bottom: 10px">
-          <li class="active"><a href="#">片区信息</a></li>
+          <li class="active"><a href="#">安检册信息</a></li>
         </ul>
         <div class="row" style="margin-top: 10px">
           <div class="col-sm-12 form-group"  style="margin: 0">
@@ -38,7 +38,7 @@
                       close-on-select></v-select>
           </div>
           <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_check_book_name.required ? 'has-error' : '']">
-            <label class="font_normal_body">片区名称</label>
+            <label class="font_normal_body">安检册名称</label>
             <input type="text" class="input_search" v-model="checkBook.f_check_book_name"
                    style="width: 60%" v-validate:f_check_book_name='{ required: true }'>
           </div>
@@ -150,7 +150,7 @@ export default {
     },
     confirm () {
       if(!this.checkBook.f_check_book_name){
-        this.$showMessage('请填写片区名称')
+        this.$showMessage('请填写安检册名称')
         return
       }
       // if(!this.checkBook.f_check_book_type){
@@ -168,15 +168,15 @@ export default {
       console.log('checkbook', this.checkBook)
       let http = new HttpResetClass()
       http.load('POST', 'rs/logic/safeEntity', {data: {tableName: 't_check_book', entityData: this.checkBook}},
-        {resolveMsg: '保存片区信息成功', rejectMsg: '保存片区信息失败'}).then(res => {
+        {resolveMsg: '保存安检册信息成功', rejectMsg: '保存安检册信息失败'}).then(res => {
         if (res.data.code === 200) {
-          this.$showMessage('保存片区信息成功',['confirm']).then(res=>{
+          this.$showMessage('保存安检册信息成功',['confirm']).then(res=>{
             if (res==='confirm'){
               bus.$emit('fresh-main')
             }
           })
         }else{
-          this.$showMessage('保存片区信息失败')
+          this.$showMessage('保存安检册信息失败')
         }
       })
     },

package/src/filiale/fugou/pc/CheckBookEntry.vue

@@ -2,15 +2,15 @@
   <div id='checkbookEntry' class="flex-row binary">
     <div class="binary-left">
       <tabset v-ref:tabs :close="false" class="nav-tabss">
-        <tab header="小区查询">
-          <check-book-search-area @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-area>
-        </tab>
-        <tab header="单位查询">
-          <check-book-search-unit @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-unit>
-        </tab>
         <tab header="用户查询">
           <check-book-search-user @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-user>
         </tab>
+        <tab header="小区查询">
+          <check-book-search-area @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-area>
+        </tab>
+<!--        <tab header="单位查询">-->
+<!--          <check-book-search-unit @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-unit>-->
+<!--        </tab>-->
       </tabset>
     </div>
     <div class="binary-right">

package/src/filiale/fugou/pc/CheckBookSearchArea.vue

@@ -21,7 +21,7 @@
                           :value-single="true" style="width: 60%"
                           class="select_list select"
                           @change="$parent.$parent.changeState"
-                          :options='$parent.$parent.isCheckBook' placeholder='有无所属片区'
+                          :options='$parent.$parent.isCheckBook' placeholder='有无所属安检册'
                           close-on-select
                           condition="{}"></v-select>
               </div>
@@ -45,22 +45,19 @@
                 <nobr><input type="checkbox" v-model="$parent.$parent.$parent.bookAll"></input>全选</nobr>
               </th>
               <th>
-                <nobr>省/市/区</nobr>
+                <nobr>区/县</nobr>
               </th>
               <th>
-                <nobr>街道</nobr>
+                <nobr>街道/乡镇</nobr>
               </th>
               <th>
-                <nobr>片区/管理站</nobr>
+                <nobr>安检册/管理站</nobr>
               </th>
               <th>
-                <nobr>小区（单位）名称</nobr>
+                <nobr>小区（单位）</nobr>
               </th>
               <th>
-                <nobr>小区（单位）地址</nobr>
-              </th>
-              <th>
-                <nobr>所属片区</nobr>
+                <nobr>所属安检册</nobr>
               </th>
             </tr>
           </template>
@@ -74,7 +71,6 @@
             <td style="text-align: center">{{ row.f_street }}</td>
             <td style="text-align: center">{{ row.f_slice_area }}</td>
             <td style="text-align: center">{{ row.f_residential_area }}</td>
-            <td style="text-align: center">{{ row.f_area_address }}</td>
             <td style="text-align: center">{{ row.f_check_book_name }}</td>
           </template>
         </data-grid>
@@ -83,7 +79,7 @@
     <modal :show.sync="showModal" :backdrop="false">
       <div slot="modal-header" class="modal-header">
         <h4 class="modal-title">
-          创建片区
+          创建安检册
         </h4>
       </div>
       <div slot="modal-body" class="modal-body">
@@ -100,7 +96,7 @@
               </role-selector-safe>
             </div>
             <div class="form-group col-sm-6"  style="margin-top: 20px">
-              <label class="font_normal_body">片区名</label>
+              <label class="font_normal_body">安检册名</label>
               <input type="text" class="input_search" v-model="checkBook.f_check_book_name"
                      style="width: 60%"  >
             </div>
@@ -195,7 +191,7 @@ import * as Util from '../../../components/Util'
 import bus from "../../../bus";
 
 export default {
-  title: '片区管理',
+  title: '安检册管理',
   data () {
     let model = new PagedList('rs/sql/safe_singleTable_OrderBy', 20,{
         items: "'ta.*,tcb.f_check_book_name'",
@@ -262,7 +258,7 @@ export default {
   methods: {
     async ok2() {
       if (!this.selectBook) {
-        this.$showMessage('请选择片区')
+        this.$showMessage('请选择安检册')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
@@ -299,7 +295,7 @@ export default {
     },
     async ok3() {
       if (!this.selectBook) {
-        this.$showMessage('请选择片区')
+        this.$showMessage('请选择安检册')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
@@ -350,7 +346,7 @@ export default {
     },
     addUser () {
       if (!this.isCreateBook) {
-        this.$showMessage('请选择查询未划分片区的用户')
+        this.$showMessage('请选择查询未划分安检册的用户')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
@@ -362,7 +358,7 @@ export default {
     },
     upUser () {
       if (!this.isChangeBook) {
-        this.$showMessage('请选择查询已划分片区的用户')
+        this.$showMessage('请选择查询已划分安检册的用户')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
@@ -374,7 +370,7 @@ export default {
     },
     async delUser () {
       if (!this.isChangeBook) {
-        this.$showMessage('请选择查询已划分片区的用户')
+        this.$showMessage('请选择查询已划分安检册的用户')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
@@ -400,8 +396,8 @@ export default {
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
         await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: delUser}},
-          {resolveMsg: null, rejectMsg: '删除片区失败'})
-        this.$showMessage('从片区删除所选用户成功')
+          {resolveMsg: null, rejectMsg: '删除安检册失败'})
+        this.$showMessage('从安检册删除所选用户成功')
         this.selectBook = ''
         this.bookAll = false
         this.bookList = []
@@ -413,7 +409,7 @@ export default {
     },
     beforeCreateBook () {
       if (!this.isCreateBook) {
-        this.$showMessage('请选择查询未划分片区的用户')
+        this.$showMessage('请选择查询未划分安检册的用户')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {

package/src/filiale/fugou/pc/CheckBookSearchUser.vue

@@ -16,9 +16,9 @@
                        style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">用户单位</label>
+                <label class="font_normal_body">用气性质</label>
                 <input type="text" class="input_search" v-model="model.f_residential_area"
-                       style="width: 60%" placeholder="用户单位" condition="f_residential_area like '%{}%'">
+                       style="width: 60%" placeholder="用气性质" condition="f_residential_area like '%{}%'">
               </div>
               <div class="form-group col-sm-3">
                 <button class="button_spacing button_search" @click="search()">查询</button>
@@ -41,6 +41,16 @@
                           close-on-select
                           condition="f_user_type ='{}'"></v-select>
               </div>
+              <div class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">用气类型</label>
+                <input type="text" class="input_search" v-model="model.f_residential_area"
+                       style="width: 60%" placeholder="用气类型" condition="f_residential_area like '%{}%'">
+              </div>
+              <div class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">用户标签</label>
+                <input type="text" class="input_search" v-model="model.f_residential_area"
+                       style="width: 60%" placeholder="用户标签" condition="f_residential_area like '%{}%'">
+              </div>
               <div class="col-sm-3 form-group" style="margin-bottom: 0px" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">公&emsp;&emsp;司</label>
                 <right-tree-safe  @re-res="$parent.$parent.getResm" v-model="model.f_orgid" condition="f_orgid in {}"></right-tree-safe>

package/src/filiale/fugou/pc.js

@@ -25,6 +25,9 @@ let specialComp = {
   'check-book': (resolve) => {
     require(['./pc/CheckBook'], resolve)
   },
+  'check-book-list': (resolve) => {
+    require(['./pc/CheckBookList'], resolve)
+  },
   'check-book-user': (resolve) => {
     require(['./pc/CheckBookUser'], resolve)
   },

package/src/filiale/wensu/android/CurrentCreate.vue

@@ -777,7 +777,7 @@
             this.$showMessage("网络异常,请检查网络后再试！")
           })
         }else{
-          this.$showMessage("该安检单已被上传！")
+          this.$showMessage("该安检单已被上传！请联系营业厅进行核查")
         }
       },
       makeAPhoneCall(phoneNumber) {

package/src/main.js

@@ -11,7 +11,7 @@ all()
 var Verificationfalg = false
 system(Verificationfalg)
 // system()
-safecheck('fugou');
+safecheck('fugou')
 // safecheck('rizhao')
 require('./bootstrap/less/bootstrap.less')
 require('./expandcss.less')