safecheck-client 3.0.33-8 → 3.0.33-80

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

@@ -4,36 +4,59 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <div class="form-group col-sm-3" >
+            <div class="form-group col-sm-3">
               <label class="font_normal_body">客户编号</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
+                     placeholder='客户编号'
                      condition="f_userinfo_code = '{}'" @keyup.enter="search()">
             </div>
-            <div class="form-group col-sm-2 button-range" >
-              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
+            <div class="form-group col-sm-2 button-range">
+              <button class="button_search" style="margin-right: 10px" @click="search()" v-el:cba>查询</button>
+
+            </div>
+            <div class="form-group col-sm-2 button-range">
+              <button class="button_search" style="margin-right: 10px" @click="$parent.$parent.delOfCheckBook()" v-el:cba>移出</button>
 
             </div>
           </div>
         </div>
       </criteria>
-      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
-        <template partial='head' >
+      <data-grid :model="model" class="table_sy" partial='list' v-ref:grid>
+        <template partial='head'>
           <tr>
-            <th><nobr>序号</nobr></th>
-            <th><nobr>用户编号</nobr></th>
-            <th><nobr>用户姓名</nobr></th>
-            <th><nobr>用户电话</nobr></th>
-            <th><nobr>用户地址</nobr></th>
+            <th>
+              <nobr><input type="checkbox" v-model="$parent.$parent.$parent.bookAll"></input>全选</nobr>
+            </th>
+            <th>
+              <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;">{{$index+1}}</td>
-             <td style="text-align:center">{{row.f_userinfo_code}}</td>
-            <td style="text-align:center">{{row.f_user_name}}</td>
-            <td style="text-align:center">{{row.f_user_phone}}</td>
-            <td style="text-align:center">{{row.f_address}}</td>
+        <template partial='body'>
+          <tr>
+            <td style="text-align: center">
+              <nobr><input type="checkbox" :checked="$parent.$parent.$parent.checkModel(row)"
+                           @change="$parent.$parent.$parent.checkChange(row, $event)"></input>
+              </nobr>
+            </td>
+            <td style="text-align:center;">{{ $index + 1 }}</td>
+            <td style="text-align:center">{{ row.f_userinfo_code }}</td>
+            <td style="text-align:center">{{ row.f_user_name }}</td>
+            <td style="text-align:center">{{ row.f_user_phone }}</td>
+            <td style="text-align:center">{{ row.f_address }}</td>
           </tr>
         </template>
         <template partial='foot'></template>
@@ -43,58 +66,92 @@
 </template>
 
 <script>
-import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
 
 export default {
   title: '安检记录列表',
   props: ['row'],
-  data () {
+  data() {
     return {
       rowdata: this.row,
-      model: new PagedList('rs/sql/getUserByCheckBook', 50)
+      bookAll: false,
+      bookList:[],
+      model: new PagedList('rs/sql/safe_singleTable_OrderBy', 50,
+        {
+          items: '"tua.f_address,tui.f_userinfo_code,tui.f_user_name,tui.f_user_phone,tui.f_userinfo_id"',
+          tablename: '"t_user_address tua left join t_userinfo tui on tua.f_userinfo_id = tui.f_userinfo_id"',
+          orderitem: '"tua.id desc"'
+        }
+      )
     }
   },
-  ready(){
-    if(this.row){
-      let condition=''
-      if(this.row.f_check_book_type1=='小区'){
-        this.model.url = 'rs/sql/getUserByCheckBook'
-        condition  = `ta.f_check_book_id =${this.row.f_check_book_id} and ta.id=${this.row.id}`
-      }else{
-        this.model.url = 'rs/sql/getUserByCheckBookCompany'
-        condition  = `tc.f_check_book_id =${this.row.f_check_book_id} and tc.id=${this.row.id}`
-      }
+  ready() {
+    if (this.row) {
+      let condition = ''
+      condition = `tua.f_check_book_id =${this.row.id}`
       this.model.search(condition)
       //只显示用户页面
-      this.row.f_check_book_type='用户'
+      this.row.f_check_book_type = '用户'
     }
   },
   watch: {
-    'row' (val) {
+    'row'(val) {
       if (val) {
         this.rowdata = val
-        let condition=''
-        if(this.row.f_check_book_type1=='小区'){
-          condition  = `ta.f_check_book_id =${val.f_check_book_id} and ta.id=${val.id}`
-        }else{
-          condition  = `tc.f_check_book_id =${val.f_check_book_id} and tc.id=${val.id}`
-        }
+        let condition = ''
+        condition = `tua.f_check_book_id =${val.id} `
         this.model.search(condition)
       }
     }
   },
   methods: {
-    selfSearch (args) {
+    selfSearch(args) {
       if (this.rowdata.id) {
-        if(this.rowdata.f_check_book_type1=='小区'){
-          args.condition += `and ta.f_check_book_id =${this.rowdata.f_check_book_id} and ta.id=${this.rowdata.id}`
-        }else{
-          args.condition += `and tc.f_check_book_id =${this.rowdata.f_check_book_id} and tc.id=${this.rowdata.id}`
-        }
+        args.condition += `and tua.f_check_book_id =${this.rowdata.id}`
         this.model.search(args.condition)
       } else {
         this.$showMessage('请选择片区')
       }
+    },
+    checkModel (row) {
+      if (this.bookAll) {
+        return true
+      } else {
+        return this.bookList.findIndex(res => res === row.f_userinfo_id) !== -1;
+      }
+    },
+    checkChange (row, e) {
+      if (e.target.checked) {
+        this.bookList.push(row.f_userinfo_id)
+      } else {
+        this.bookList.splice(this.bookList.findIndex(res => res === row.f_userinfo_id), 1)
+      }
+    },
+    delOfCheckBook(){
+      try {
+        let upAddress = `update t_user_address set f_check_book_id = null where 1 = 2 `
+        if (this.bookAll){
+          upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${this.row.id}'`
+        }else if (this.bookList.length > 0){
+          let codes = this.bookList.map( item => { return `'${item}'` } ).join()
+          upAddress = `update t_user_address set f_check_book_id = null where f_userinfo_id in (${codes})`
+        }
+        this.$showMessage('确认移出安检册', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let http = new HttpResetClass()
+            http.load('POST', 'rs/logic/runSQL', {data: {sql: upAddress}},
+              {resolveMsg: null, rejectMsg: '移出安检册失败'}).then(resp=>{
+              this.$showMessage('移出成功')
+              this.$refs.paged.$refs.criteria.search()
+            }).catch(error=>{
+              this.$showMessage('移出失败',error)
+
+            })
+          }
+        })
+      }catch (e) {
+        this.$showMessage('移出失败',e)
+      }
     }
   }
 }

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

@@ -199,9 +199,9 @@
                         v-model="model.f_user_tags"
                         :options='$parent.$parent.userTags'
                         filer-key="name"
-                        close-on-select clear-button
-                        condition="f_user_tags='{}'"
-                        :value-single="true">
+                        :multiple="true"
+                        condition="f_user_tags in {}"
+                       >
               </v-select>
             </div>
             <div :class="$parent.$parent.style">
@@ -212,9 +212,9 @@
                         v-model="model.f_user_gas_type"
                         :options='$parent.$parent.userGasType'
                         filer-key="name"
-                        close-on-select clear-button
-                        condition="f_user_gas_type='{}'"
-                        :value-single="true">
+                        :multiple="true"
+                        condition="f_user_gas_type in {}"
+                       >
               </v-select>
             </div>
           </div>
@@ -414,6 +414,8 @@
             <th><nobr>用户电话</nobr></th>
             <th><nobr>用户小区</nobr></th>
             <th><nobr>用户地址</nobr></th>
+            <th><nobr>用户标签</nobr></th>
+            <th><nobr>用气类型</nobr></th>
             <th><nobr>开户时间</nobr></th>
             <th><nobr>安检时间</nobr></th>
             <th><nobr>安检员</nobr></th>
@@ -436,6 +438,8 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_user_phone}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_residential_area}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_address}}</td>
+          <td style="text-align: center">{{ row.f_user_tags }}</td>
+          <td style="text-align: center">{{ row.f_user_gas_type }}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_gas_date}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_offsite_time}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_checker_name}}</td>

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

@@ -193,9 +193,8 @@
                           v-model="model.f_user_tags"
                           :options='$parent.$parent.userTags'
                           filer-key="name"
-                          close-on-select clear-button
-                          condition="f_user_tags='{}'"
-                          :value-single="true">
+                          condition="f_user_tags in {}"
+                          :multiple="true">
                 </v-select>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
@@ -206,9 +205,8 @@
                           v-model="model.f_user_gas_type"
                           :options='$parent.$parent.userGasType'
                           filer-key="name"
-                          close-on-select clear-button
-                          condition="f_user_gas_type='{}'"
-                          :value-single="true">
+                          condition="f_user_gas_type in {}"
+                          :multiple="true">
                 </v-select>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
@@ -267,6 +265,12 @@
               <th>
                 <nobr>客户小区</nobr>
               </th>
+              <th>
+                <nobr>用户标签</nobr>
+              </th>
+              <th>
+                <nobr>用气类型</nobr>
+              </th>
               <th>
                 <data-order field="f_address" name="客户地址"></data-order>
               </th>
@@ -312,6 +316,8 @@
             <td style="text-align: center">{{row.f_user_name}}</td>
             <td style="text-align: center">{{row.f_user_phone}}</td>
             <td style="text-align: center">{{row.f_residential_area}}</td>
+            <td style="text-align: center">{{ row.f_user_tags }}</td>
+            <td style="text-align: center">{{ row.f_user_gas_type }}</td>
             <td style="text-align: center">{{row.f_address}}</td>
             <td style="text-align: center">{{row.f_offsite_time}}</td>
             <td style="text-align: center">{{row.f_checker_name}}</td>

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

@@ -295,9 +295,9 @@
                           :value.sync="model.f_user_tags" v-model="model.f_user_tags"
                           :options='$parent.$parent.userTags'
                           filer-key="name"
-                          close-on-select clear-button
-                          condition="f_user_tags='{}'"
-                          :value-single="true">
+                          :multiple="true"
+                          condition="f_user_tags in {}"
+                          >
                 </v-select>
               </div>
               <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
@@ -307,9 +307,9 @@
                           :value.sync="model.f_user_gas_type" v-model="model.f_user_gas_type"
                           :options='$parent.$parent.userGasType'
                           filer-key="name"
-                          close-on-select clear-button
-                          condition="f_user_gas_type='{}'"
-                          :value-single="true">
+                          :multiple="true"
+                          condition="f_user_gas_type in {}"
+                          >
                 </v-select>
               </div>
             </div>
@@ -362,6 +362,12 @@
               <th>
                 <nobr>用气状态</nobr>
               </th>
+              <th>
+                <nobr>用户标签</nobr>
+              </th>
+              <th>
+                <nobr>用气类型</nobr>
+              </th>
               <th>
                 <data-order field="f_offsite_time" name="安检时间"></data-order>
               </th>
@@ -407,6 +413,8 @@
             <td style="text-align: center">{{ row.f_entry_status }}</td>
             <td style="text-align: center">{{ row.f_plan_name }}</td>
             <td style="text-align: center">{{ row.f_usegas }}</td>
+            <td style="text-align: center">{{ row.f_user_tags }}</td>
+            <td style="text-align: center">{{ row.f_user_gas_type }}</td>
             <td style="text-align: center">{{ row.f_offsite_time }}</td>
             <td style="text-align: center">{{ row.f_checker_name }}</td>
             <td style="text-align: center">{{ row.f_repair_approved_note }}</td>

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

@@ -27,7 +27,7 @@
              v-for="row in checkplan.list.data" @click="selectPlanChange(row)">
           <table style="width:100%;table-layout:fixed">
             <tr class="safe-planfont">
-              <td rowspan="6"><input type="checkbox" style="pointer-events:auto"
+              <td rowspan="7"><input type="checkbox" style="pointer-events:auto"
                                      v-show="row.plan_count==0 || row.f_issued=='未下发'"
                                      onClick="event.cancelBubble = true"
                                      :checked="checkplan.check.isChecked(row.f_check_item_id)"
@@ -59,6 +59,18 @@
                   :title="row.f_create_time">{{ row.f_create_time }}
               </td>
             </tr>
+            <tr class="safe-bodyfont" v-if="row.f_end_time">
+              <td colspan="3">结束时间 :</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  :title="row.f_end_time">{{ row.f_end_time }}
+              </td>
+            </tr>
+            <tr class="safe-bodyfont" >
+              <td colspan="3">计划状态:</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  >{{ checkState(row.f_end_time,row.unchecked)}}
+              </td>
+            </tr>
             <tr class="safe-bodyfont" v-if="row.f_safecheck_type">
               <td colspan="3">安检类型 :</td>
               <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
@@ -66,7 +78,7 @@
               </td>
             </tr>
             <tr class="safe-bodyfont" v-if="row.f_safecheck_type">
-              <td >
+              <td colspan="8">
                 <input type="button" style="pointer-events:auto"
                        @click="showPlanHistory(row)"
                        onClick="event.cancelBubble = true"/>变更记录
@@ -139,18 +151,20 @@
             <label class="font_normal_body">开始时间</label>
             <datepicker
               :value.sync="planCondition.f_start_time"
+              style="width: 60%;margin-bottom: 8px"
               :format="'yyyy-MM-dd HH:mm:ss'"
               v-model="planCondition.f_start_time"
-              :show-reset-button="reset" placeholder="请输入开始时间"  style="margin-bottom: 8px">
+              :show-reset-button="reset" placeholder="请输入开始时间">
             </datepicker>
           </div>
           <div class="form-group col-sm-4">
             <label class="font_normal_body">结束时间:</label>
             <datepicker
               :value.sync="planCondition.f_end_time"
+              style="width: 60%;margin-bottom: 8px"
               :format="'yyyy-MM-dd HH:mm:ss'"
               v-model="planCondition.f_end_time"
-              :show-reset-button="reset" placeholder="请输入结束时间"  style="margin-bottom: 8px">
+              :show-reset-button="reset" placeholder="请输入结束时间">
             </datepicker>
           </div>
           <div class="form-group col-sm-4">
@@ -231,6 +245,21 @@
             >
             </v-select>
           </div>
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">计划类型:</label>
+            <v-select
+              class="select select_list"
+              :value.sync="planCondition.f_plan_type"
+              v-model="planCondition.f_plan_type"
+              @change="setProperty('checkplan','f_plan_type',planCondition.f_plan_type)"
+              :search="false"
+              :options='planType'
+              placeholder='请选择'
+              close-on-select
+              value-single
+            >
+            </v-select>
+          </div>
         </div>
       </div>
       <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -397,7 +426,7 @@
               value-single>
             </v-select>
           </div>
-          <div class="form-group col-sm-4" v-if="$login.f.rolestr.includes('计划结束时间')==true">
+          <div class="form-group col-sm-4" >
             <label class="font_normal_body">结束时间:</label>
             <datepicker
               :value.sync="upCheckPlan.f_end_time"
@@ -602,6 +631,29 @@ export default {
 
   },
   methods: {
+    //判断计划状态
+    checkState(time,unchecked) {
+      //判断当前时间与time的大小，time格式为 yyyy-MM-dd HH:mm:ss
+      let now = new Date()
+      let last = new Date(time)
+      if(time==undefined || time==''){
+        return  '无'
+      }else{
+        if(last.getTime() >now.getTime() ){
+          return  '安检中'
+        }else if(last.getTime() <now.getTime()){
+          //结束时间小于当前时间，
+          //判断未检数，未检大于0，则逾期
+          if(unchecked>0){
+            return '逾期'
+          }
+          if(unchecked<=0){
+            return '已完成'
+          }
+        }
+      }
+
+    },
     showPlanHistory(row){
       this.showPlanHistoryButton = true
       this.planHistory = JSON.parse(row.f_update_check_plan)
@@ -776,7 +828,8 @@ export default {
           "isAndNot": "f_checker {}",
           "safechecktype": "f_safecheck_type='{}'",
           "issude": "f_issued = '{}'",
-          "f_create_operator": "f_create_operator like '%{}%'"
+          "f_create_operator": "f_create_operator like '%{}%'",
+          "f_plan_type": "f_plan_type = '{}'"
         },
         {
           orderitem: fieldValue,
@@ -807,10 +860,10 @@ export default {
       this.showUpPlan = true
     },
     async upPlan() {
-      if (this.upCheckPlan.f_issued == '已下发') {
+      /*if (this.upCheckPlan.f_issued == '已下发') {
         this.$showMessage("该计划已下发，无法进行修改！")
         return
-      }
+      }*/
       if (!this.upCheckPlan.f_plan_name) {
         Vue.showMessage("请输入安检计划名称！")
         return false
@@ -849,6 +902,7 @@ export default {
           f_end_time: this.upCheckPlan.f_end_time,
           f_operetiom_name:this.upCheckPlan.f_operetiom_name,
           f_update_message:this.upCheckPlan.f_update_message,
+          issued: '是' // 修改已下发计划
         }
       }, {resolveMsg: null, rejectMsg: null})
       if (res.data.code == 200) {