safecheck-client 3.0.32-25 → 3.0.32-27

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

@@ -51,10 +51,10 @@
                 <nobr>街道/乡镇</nobr>
               </th>
               <th>
-                <nobr>安检册/管理站</nobr>
+                <nobr>片区/行政村</nobr>
               </th>
               <th>
-                <nobr>小区（单位）</nobr>
+                <nobr>小区/自然村</nobr>
               </th>
               <th>
                 <nobr>所属安检册</nobr>
@@ -69,7 +69,7 @@
             </td>
             <td style="text-align: center">{{ row.f_pcd }}</td>
             <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_community_name }}</td>
             <td style="text-align: center">{{ row.f_residential_area }}</td>
             <td style="text-align: center">{{ row.f_check_book_name }}</td>
           </template>
@@ -194,8 +194,8 @@ export default {
   title: '安检册管理',
   data () {
     let model = new PagedList('rs/sql/safe_singleTable_OrderBy', 20,{
-        items: "'ta.*,tcb.f_check_book_name'",
-        tablename: "'t_area ta left join t_check_book tcb on ta.f_check_book_id=tcb.id'",
+        items: "'ta.f_residential_area,ta.id,tcb.f_check_book_name,tcm.f_community_name,tcm.f_street'",
+        tablename: "'t_area ta left join t_check_book tcb on ta.f_check_book_id=tcb.id left join t_community tcm on ta.f_community_id = tcm.id'",
         orderitem: "'id desc'"
       })
     return {

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

@@ -17,8 +17,18 @@
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">用气性质</label>
-                <input type="text" class="input_search" v-model="model.f_residential_area"
-                       style="width: 60%" placeholder="用气性质" condition="f_gasproperties like '%{}%'">
+                <v-select
+                  class="select select_list"
+                  :value.sync="model.f_gasproperties"
+                  v-model="model.f_gasproperties"
+                  :options='$parent.$parent.gasproperties'
+                  placeholder='请选择'
+                  condition="f_gasproperties='{}'"
+                  :search="false"
+                  close-on-select
+                  value-single
+                >
+                </v-select>
               </div>
               <div class="form-group col-sm-3">
                 <button class="button_spacing button_search" @click="search()">查询</button>
@@ -292,7 +302,13 @@ export default {
       showModal2: false,
       showModal3: false,
       userGasType:[{label: '全部', value: ''},...this.$appdata.getParam('用气类型')],
-      userTags:[{label: '全部', value: ''},...this.$appdata.getParam('用户标签')]
+      userTags:[{label: '全部', value: ''},...this.$appdata.getParam('用户标签')],
+      gasproperties:[{label: '全部', value: ''},...this.$appdata.getParam('用气性质')],
+    }
+  },
+  props: {
+    showtype:{
+      type: String
     }
   },
   computed: {
@@ -582,6 +598,7 @@ export default {
       // if (this.$refs.paged.$refs.criteria.model.f_orgid){
       //   args.condition += `f_orgid in ${this.$refs.paged.$refs.criteria.model.f_orgid}`
       // }
+      args.condition += ` and f_user_type = '${this.showtype}' `
       this.model.search(args.condition, args.model)
     },
     freshCheckBook () {

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

@@ -65,6 +65,13 @@
                   :title="row.f_safecheck_type">{{ row.f_safecheck_type }}
               </td>
             </tr>
+            <tr class="safe-bodyfont" v-if="row.f_safecheck_type">
+              <td >
+                <input type="button" style="pointer-events:auto"
+                       @click="showPlanHistory(row)"
+                       onClick="event.cancelBubble = true"/>变更记录
+              </td>
+            </tr>
           </table>
         </div>
       </div>
@@ -316,7 +323,6 @@
             >
             </v-select>
           </div>
-
           <div class="form-group col-sm-4">
             <label class="font_normal_body">安检类型:</label>
             <v-select
@@ -332,27 +338,13 @@
             </v-select>
           </div>
           <div class="form-group col-sm-4">
-            <label class="font_normal_body">用气性质:</label>
+            <label class="font_normal_body">计划类型:</label>
             <v-select
               class="select select_list"
-              :value.sync="createPlan.f_gasproperties"
-              v-model="createPlan.f_gasproperties"
+              :value.sync="createPlan.f_plan_type"
+              v-model="createPlan.f_plan_type"
               :search="false"
-              :options='gasproperties'
-              placeholder='请选择'
-              close-on-select
-              value-single
-            >
-            </v-select>
-          </div>
-          <div class="form-group col-sm-4">
-            <label class="font_normal_body">用户类型:</label>
-            <v-select
-              class="select select_list"
-              :value.sync="createPlan.f_user_type"
-              v-model="createPlan.f_user_type"
-              :search="false"
-              :options='userType'
+              :options='planType'
               placeholder='请选择'
               close-on-select
               value-single
@@ -391,18 +383,7 @@
 
               close-on-select
               value-single>
-
-
             </v-select>
-            <!--              <datepicker
-                            placeholder='请选择'
-                            style="width:60%"
-                            :disabled-days-of-week="[]"
-                            :format="'yyyy'"
-                            :show-rest-button="reset"
-                            :value.sync="upCheckPlan.f_plan_year"
-                            v-model="upCheckPlan.f_plan_year">
-                          </datepicker>-->
           </div>
           <div class="form-group col-sm-4">
             <label class="font_normal_body">计划月份:</label>
@@ -416,6 +397,15 @@
               value-single>
             </v-select>
           </div>
+          <div class="form-group col-sm-4" v-if="$login.f.rolestr.includes('计划结束时间')==true">
+            <label class="font_normal_body">结束时间:</label>
+            <datepicker
+              :value.sync="upCheckPlan.f_end_time"
+              :format="'yyyy-MM-dd HH:mm:ss'"
+              v-model="upCheckPlan.f_end_time"
+              :show-reset-button="reset" placeholder="请输入结束时间"  style="margin-bottom: 8px">
+            </datepicker>
+          </div>
           <div class="form-group col-sm-4">
             <label class="font_normal_body">是否共享:</label>
             <v-select
@@ -455,6 +445,23 @@
             >
             </v-select>
           </div>
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">安检类型:</label>
+            <v-select
+              class="select select_list"
+              :value.sync="upCheckPlan.f_safecheck_type"
+              v-model="upCheckPlan.f_safecheck_type"
+              :options='ntoway'
+              close-on-select
+              value-single
+            >
+            </v-select>
+          </div>
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">修改原因:</label>
+            <input type="text" class="input_search" v-model="upCheckPlan.f_update_message"
+                   style="width: 60%"/>
+          </div>
         </div>
       </div>
       <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -462,6 +469,45 @@
         <button class="button_search" @click="cancel">取消</button>
       </div>
     </modal>
+    <modal :show.sync="showPlanHistoryButton" v-ref:modalp>
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          计划变更记录
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <div class="leftplan-center safe_plan_list">
+          <div class="row safe-leftplan safe_list_li"
+               v-for="row in planHistory">
+            <table style="width:100%;table-layout:fixed">
+              <tr class="safe-bodyfont">
+                <td colspan="3">变更时间 :</td>
+                <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ row.f_update_time }}
+                </td>
+              </tr>
+              <tr class="safe-bodyfont">
+                <td colspan="3">原因 :</td>
+                <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ row.f_update_message }}
+                </td>
+              </tr>
+              <tr class="safe-bodyfont">
+                <td colspan="3">操作人 :</td>
+                <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ row.f_operatiom_name }}
+                </td>
+              </tr>
+              <tr class="safe-bodyfont">
+                <td colspan="3">操作时间 :</td>
+                <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ row.f_operatiom_time }}
+                </td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button class="button_search" @click="showPlanHistoryButton = false">取消</button>
+      </div>
+    </modal>
   </div>
 </template>
 
@@ -475,6 +521,8 @@ export default {
   title: '计划管理',
   data() {
     return {
+      showPlanHistoryButton:false,
+      planHistory:'',
       a: '1',
       opt: [{label: "按时间降序", value: "按时间降序"}, {label: "按时间升序", value: "按时间升序"}],
       currentorder: '按时间降序',
@@ -488,7 +536,10 @@ export default {
         f_checker_id: '',
         isShare: '',
         f_checker: '',
-        checker: {}
+        checker: {},
+        f_end_time:'',
+        f_update_message:'',
+        f_operetiom_name:this.$login.f.name
       },
       isSend: false,
       createPlan: {
@@ -502,7 +553,8 @@ export default {
         f_checker: null,
         f_safecheck_type: '',
         f_end_time:'',
-        f_start_time:''
+        f_start_time:'',
+        f_plan_type:''
       },
       planCondition: {},
       showCondtion: false,
@@ -555,10 +607,17 @@ export default {
     },
     userType(){
       return  this.$appdata.getParam('用户类型')
+    },
+    planType(){
+      return  this.$appdata.getParam('计划类型')
     }
 
   },
   methods: {
+    showPlanHistory(row){
+      this.showPlanHistoryButton = true
+      this.planHistory = JSON.parse(row.f_update_check_plan)
+    },
     /*  ntoway() {
         /!* return AppData.getParam('安检类型')*!/
         return Vue.$appdata.getParam('安检类型')
@@ -627,7 +686,6 @@ export default {
         this.createPlan.f_checker = this.createPlan.checker.name
       }
       console.log("this.createPlan.f_checker:" + this.createPlan.f_checker)
-      this.createPlan.f_plan_type = '预约计划'
       this.createPlan.f_subcompany = this.userlogin.orgstr
       this.createPlan.f_filialeid = this.userlogin.orgid
       this.createPlan.f_create_operator = this.userlogin.name
@@ -647,7 +705,10 @@ export default {
         checker: {},
         f_checker: null,
         f_safecheck_type: '',
-        f_create_operator: ''
+        f_create_operator: '',
+        f_start_time: '',
+        f_end_time: '',
+        f_plan_type:''
       }
       await this.loadCheckPlan()
       this.isSend = false
@@ -774,6 +835,10 @@ export default {
         Vue.showMessage("请选择安检月份！")
         return false
       }
+      if (!this.upCheckPlan.f_update_message) {
+        Vue.showMessage("请选择填写修改原因！")
+        return false
+      }
       console.log(this.upCheckPlan)
 
       if (this.upCheckPlan.isShare == "是") {
@@ -792,7 +857,10 @@ export default {
           f_plan_name: this.upCheckPlan.f_plan_name,
           f_plan_year: this.upCheckPlan.f_plan_year,
           f_plan_month: this.upCheckPlan.f_plan_month,
-          f_plan_id: this.upCheckPlan.id
+          f_plan_id: this.upCheckPlan.id,
+          f_end_time: this.upCheckPlan.f_end_time,
+          f_operetiom_name:this.upCheckPlan.f_operetiom_name,
+          f_update_message:this.upCheckPlan.f_update_message,
         }
       }, {resolveMsg: null, rejectMsg: null})
       if (res.data.code == 200) {

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

@@ -22,18 +22,18 @@
               <input type="text" class="input_search" v-model="model.f_address"
                      style="width: 95%" placeholder="客户地址" condition="i.f_address like '%{}%'">
             </div>
-            <!--<div class="form-group col-sm-1" >
+            <div class="form-group col-sm-1" >
               <v-select :width="'95%'"
                         class="select select_list"
-                        :value.sync="$parent.$parent.f_state"
-                        v-model="$parent.$parent.f_state"
-                        :options='$parent.$parent.checkState'
-                        placeholder='安检状态'
+                        :value.sync="model.f_plan_type"
+                        v-model="model.f_plan_type"
+                        :options='$parent.$parent.planType'
+                        placeholder='计划类型'
                         close-on-select
                         value-single
               >
               </v-select>
-            </div>-->
+            </div>
             <div class="form-group col-sm-3" >
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUserCondition()">更多条件</button>
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
@@ -209,6 +209,9 @@
           condition: this.$refs.paged.model.condition,
           groupName: this.groupNameForSql
         }
+      },
+      planType(){
+        return  this.$appdata.getParam('计划类型')
       }
     },
     methods:{

package/src/filiale/fugou/pc.js

@@ -13,6 +13,9 @@ let specialComp = {
   'check-plan-list': (resolve) => {
     require(['./pc/checkPlanList'], resolve)
   },
+  'check-book-details': (resolve) => {
+    require(['./pc/CheckBookDetails'], resolve)
+  },
   'plan-manage': (resolve) => {
     require(['./pc/PlanManage.vue'], resolve)
   },

package/src/filiale/qingjian/android/SafecheckOrderV.vue

@@ -1961,6 +1961,7 @@ export default {
       this.$set('data.f_residential_area' , this.item.f_residential_area)
       this.$set('data.f_idnumber', this.item.f_idnumber)
       this.$set('data.f_comments', this.item.f_comments)
+      this.$set('data.f_userinfo_comments', this.item.f_plan_meters[0].f_userinfo_comments)
       this.$set('data.f_userproperties', this.item.f_userproperties)
       this.$set('data.f_client_evaluation', '满意')
       this.$set('data.f_userfiles_id', this.item.f_plan_meters[0].f_userfiles_id)

package/src/filiale/qingjian/android/SafecheckUserInfo.vue

@@ -45,6 +45,10 @@
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>安检状态:</b></p>
           <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_state }}</p>
         </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>备注:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_userinfo_comments}}</p>
+        </div>
         <div class="col-xs-12">
           <button type="button" style="width: 45%;float: left" class="btn btn-primary" v-if="updateuserphone"
                   @click="updatePhone(userinfo.f_user_phone,userinfo.f_userinfoid)">电话修改

package/src/main.js

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