safecheck-client 4.0.2-7 → 4.0.2-70

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

@@ -41,7 +41,7 @@
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_start"
-                  condition="f_offsite_time > ='{} 00:00:00'">
+                  condition="f_offsite_time >= '{} 00:00:00'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-2"   >
@@ -340,6 +340,9 @@
               <th>
                 <nobr>备注</nobr>
               </th>
+              <th>
+                <nobr>安检备注</nobr>
+              </th>
               <th>
                 <nobr>开户时间</nobr>
               </th>
@@ -382,6 +385,7 @@
             <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>
+            <td style="text-align: center">{{ row.f_comments }}</td>
             <td style="text-align: center">{{ row.f_gas_date }}</td>
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">{{ row.f_approved_by }}</td>
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">{{ row.f_approvedstart_time }}</td>
@@ -601,6 +605,9 @@ export default {
       },
       //获取省市区列表
       getPcd(val){
+        if (!val){
+          return
+        }
         this.pcds = [{label:'全部',value:''}]
         new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
           {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid in ${val}`}},

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

@@ -165,7 +165,7 @@
               class="select select_list"
               :value.sync="planCondition.f_checker"
               v-model="planCondition.f_checker"
-              @change="setProperty('checkplan','checkerid',planCondition.f_checker.id)"
+              @change="setProperty('checkplan','checkerid',planCondition.f_checker ? planCondition.f_checker.id : '')"
               :options='getConList("checker")'
               placeholder='请选择'
               close-on-select
@@ -602,8 +602,14 @@
             this.createPlan.f_checker_id=null
             this.createPlan.f_checker=null
           }else{
-            this.createPlan.f_checker_id=this.createPlan.checker.id
-            this.createPlan.f_checker=this.createPlan.checker.name
+            if(this.createPlan.checker && this.createPlan.checker.id){
+              this.createPlan.f_checker_id=this.createPlan.checker.id
+              this.createPlan.f_checker=this.createPlan.checker.name
+            }else{
+              Vue.showMessage("请选择安检人员！")
+              this.isSend=false
+              return
+            }
           }
           console.log("this.createPlan.f_checker:"+this.createPlan.f_checker)
           this.createPlan.f_plan_type='预约计划'

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

@@ -22,29 +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" >
-              <datepicker
-                placeholder='创建起始'
-                style="width:100%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy-MM-dd'"
-                :show-rest-button="reset"
-                :value.sync="model.f_starcreate_time"
-                v-model="model.f_starcreate_time"
-                condition="i.f_create_time >='{} 00:00:00'">
-              </datepicker>
-            </div>
-            <div class="form-group col-sm-1" style="margin-left: 6px;margin-right: 6px;">
-              <datepicker
-                placeholder='创建结束'
-                :disabled-days-of-week="[]"
-                style="width:100%"
-                :format="'yyyy-MM-dd'"
-                :show-rest-button="reset"
-                :value.sync="model.f_endcreate_time"
-                v-model="model.f_endcreate_time"
-                condition="i.f_create_time  <='{} 00:00:00'">
-              </datepicker>
+            <div class="form-group col-sm-1 upuserinfo_sel" >
+              <v-select v-model="model.f_meter_book_num"
+                        :multiple="true" :options='$parent.$parent.checkBooks'
+                        :value.sync="model.f_meter_book_num"
+                        class="select select_list"
+                        @select-search="$parent.$parent.select_book"
+                        :width="'95%'"
+                        :timeout="500"
+                        placeholder='安检册选择'
+                        condition="i.f_check_book_id in {}" >
+              </v-select>
+
             </div>
             <!--<div class="form-group col-sm-1" >
               <v-select :width="'95%'"
@@ -137,6 +126,33 @@
                       condition="i.f_last_check_date  <='{} 00:00:00'">
                     </datepicker>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">创建起始:</label>
+                    <datepicker
+                      placeholder='创建起始'
+                      style="width:60%"
+                      :disabled-days-of-week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_starcreate_time"
+                      v-model="model.f_starcreate_time"
+                      condition="i.f_create_time >='{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">创建起始:</label>
+                    <datepicker
+                      placeholder='创建起始'
+                      :disabled-days-of-week="[]"
+                      style="width:60%"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_endcreate_time"
+                      v-model="model.f_endcreate_time"
+                      condition="i.f_create_time  <='{} 00:00:00'">
+                    </datepicker>
+                  </div>
+
 <!--                  <div class="form-group col-sm-4" >-->
 <!--                    <label class="font_normal_body">创建起始:</label>-->
 <!--                    <datepicker-->
@@ -235,6 +251,7 @@
         opt:[{label:"测试",value:"测试"}],
         showCondtion:false,
         checkAll:false,
+        checkBooks:[],
         checkes:[],
         checkResults:[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}],
         checkState:[{label:'全部',value:''},{label:'未检',value:'未检'},{label:'已检',value:'已检'}],
@@ -253,7 +270,7 @@
     },
     props:["selectplan","userlogin"],
     ready(){
-
+      this.getCheckBook()
     },
     computed:{
       exportParameter(){
@@ -265,6 +282,38 @@
       }
     },
     methods:{
+      select_book(text){
+        //tag
+        let pcdText=text?` and f_check_book_name  like '%${text}%'`:''
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_check_book",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          //tag)
+          if(res.data.length>0){
+            this.checkBooks = []
+            res.data.forEach((result)=>{
+              this.checkBooks.push({label:result.f_check_book_name,value:result.id})
+            })
+          }
+          //tag)
+        })
+      },
+      getCheckBook(){
+        this.checkBooks=[]
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=1000`, {
+          data: {
+            items: 'id,f_check_book_name,f_check_book_type',
+            tablename: 't_check_book',
+            condition: `f_orgid = '${this.userlogin.orgid}'`,
+            orderitem: 'id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then(res => {
+          res.data.forEach(ress => {
+            this.checkBooks.push({
+              label: ress.f_check_book_name,
+              value: ress.id
+            })
+          })
+        })
+      },
       clear(){
         this.model.f_plan_id = '';
         this.model.f_userinfo_code = '';

package/src/filiale/jinhong/pc/checkUserList.vue

@@ -290,6 +290,21 @@
                       condition="ui.f_uservent_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
+                  <div class="form-group col-sm-4">
+                    <label class="font_normal_body">单位名称:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.civill_name"
+                      v-model="model.civill_name"
+                      :options='$parent.$parent.civill_names'
+                      placeholder='请选择'
+                      condition="ci.f_user_name = '{}'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                 </div>
               </div>
               <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -334,6 +349,7 @@
             <th title="最后一次安检日期"><nobr>安检日期</nobr></th>
             <th><nobr>首次通气时间</nobr></th>
             <th><nobr>详细地址</nobr></th>
+            <th><nobr>单位名称</nobr></th>
           </tr>
         </template>
         <template partial='body'>
@@ -351,6 +367,7 @@
           <td style="text-align: center"><nobr>{{row.f_last_check_date}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_uservent_date}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.civill_name}}</nobr></td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -382,6 +399,7 @@
         gasproperties:[],//用气性质
         meter_classifys:[],//气表类型
         hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
+        civill_names:[{label:"全部",value:""}],
         yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
         entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
         sliceArea:[],
@@ -399,11 +417,29 @@
     props:["selectplan","userlogin"],
     ready(){
       this.getCheckBook()
+      this.getCivillNames()
       this.setConList()
       this.loadpage()
       document.addEventListener('keydown', this.handleEnter, true);
     },
     methods: {
+      getCivillNames(){
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=1000`, {
+          data: {
+            items: 'f_user_name',
+            tablename: 't_civill',
+            condition: `f_orgid = '${this.userlogin.orgid}'`,
+            orderitem: 'id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then(res => {
+          res.data.forEach(ress => {
+            this.civill_names.push({
+              label: ress.f_user_name,
+              value: ress.f_user_name
+            })
+          })
+        })
+      },
       clearcon(){
         this.$refs.paged.$refs.criteria.model.f_userinfo_code = ''
         this.$refs.paged.$refs.criteria.model.f_meternumber = ''

package/src/filiale/jinhong/pc.js

@@ -8,6 +8,7 @@ let specialComp = {
   'check-plan-list': (resolve) => {require(['./pc/checkPlanList.vue'], resolve)},
   'plan-manage': (resolve) => {require(['./pc/PlanManage.vue'], resolve)},
   'check-book-list': (resolve) => {require(['./pc/CheckBookList.vue'], resolve)},
+  'new-check-paper': (resolve) => {require(['./pc/NewCheckpaper'], resolve)},
   'select-check-plan': (resolve) => {require(['./pc/SelectCheckPlan.vue'], resolve)}
 
 }