safecheck-client 4.0.0-66 → 4.0.0-68

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -28,10 +28,10 @@
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <export-excel :data="$parent.$parent.searchData"
-                                 :field="$parent.$parent.excelHeaders"
-                                 :choose-col="true"
-                                 sqlurl="api/af-safecheck/logic/exportfile" sql-name="根据安检员查询用户档案"
-                                 template-name='用户安检情况'></export-excel>
+                            :field="$parent.$parent.excelHeaders"
+                            :choose-col="true"
+                            sqlurl="api/af-safecheck/logic/exportfile" sql-name="根据安检员查询用户档案"
+                            template-name='用户安检情况'></export-excel>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -102,7 +102,7 @@
                         class="select select_list"
                         :value.sync="$parent.$parent.checkStates"
                         :options='$parent.$parent.checkstatus'
-                        ></v-select>
+              ></v-select>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
               <label class="font_normal_body">隐患情况</label>
@@ -132,27 +132,27 @@
               </role-selector-safe>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-            <label class="font_normal_body">片&emsp;&emsp;区</label>
-            <v-select class="select_list select"
-                      placeholder='片区/管理站' style="width: 60%"
-                      :value.sync="model.f_slice_area" v-model="model.f_slice_area"
-                      :options='$parent.$parent.sliceArea'
-                      filer-key="name"
-                      close-on-select clear-button
-                      condition="f_slice_area='{}'"
-                      @change="$parent.$parent.getmeterbook(model.f_slice_area)"
-                      :value-single="true">
-            </v-select>
+              <label class="font_normal_body">片&emsp;&emsp;区</label>
+              <v-select class="select_list select"
+                        placeholder='片区/管理站' style="width: 60%"
+                        :value.sync="model.f_slice_area" v-model="model.f_slice_area"
+                        :options='$parent.$parent.sliceArea'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_slice_area='{}'"
+                        @change="$parent.$parent.getmeterbook(model.f_slice_area)"
+                        :value-single="true">
+              </v-select>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
               <label class="font_normal_body">抄&ensp;表&ensp;册</label>
               <v-select class="select_list select"
                         placeholder='抄表册' style="width: 60%"
                         :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
-                        :options='$parent.$parent.checkBooks'
+                        :options='$parent.$parent.cbc'
                         filer-key="name"
                         close-on-select clear-button
-                        condition="f_check_book_name like '%{}%'"
+                        condition="f_meter_book_num={}"
                         :value-single="true">
               </v-select>
             </div>
@@ -205,9 +205,9 @@
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <export-excel :data="$parent.$parent.searchData"
-                                 :field="$parent.$parent.excelHeaders"
-                                 sqlurl="api/af-safecheck/logic/exportfile" sql-name="根据安检员查询用户档案"
-                                 template-name='用户安检情况'></export-excel>
+                            :field="$parent.$parent.excelHeaders"
+                            sqlurl="api/af-safecheck/logic/exportfile" sql-name="根据安检员查询用户档案"
+                            template-name='用户安检情况'></export-excel>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -339,18 +339,18 @@
             <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>-->
             <th>
               <nobr>小区名称</nobr>
             </th>
@@ -360,9 +360,9 @@
             <th>
               <nobr>安检员</nobr>
             </th>
-<!--            <th>-->
-<!--              <nobr>安检员备注</nobr>-->
-<!--            </th>-->
+            <!--            <th>-->
+            <!--              <nobr>安检员备注</nobr>-->
+            <!--            </th>-->
             <th>
               <nobr>安检日期</nobr>
             </th>
@@ -389,10 +389,10 @@
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{$parent.$parent.$parent.dateDiff(row.f_last_check_date)}}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{ row.f_user_phone }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_meternumber}}</td>
-<!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_meter_brand}}</td>-->
+          <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_meter_brand}}</td>-->
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_user_type }}</td>
-<!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_hasfurnace }}</td>-->
-<!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_haskitchen }}</td>-->
+          <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_hasfurnace }}</td>-->
+          <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_haskitchen }}</td>-->
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_residential_area }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_address }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_checker_name }}</td>
@@ -529,8 +529,7 @@ export default {
       sliceArea: [],
       cbcs:[],
       cbc:[],
-      pcds:[],
-      checkBooks:[]
+      pcds:[]
     }
   },
   props: {
@@ -561,75 +560,50 @@ export default {
     this.model.f_OrgStr = this.$login.f.orgpathstr
     this.Mreadibook(`('${this.$login.f.orgid}')`)
     this.getAllMeterBook(`('${this.$login.f.orgid}')`)
-    document.addEventListener('keydown', this.handleEnter, true);
   },
   methods: {
-    handleEnter(e) {
-      if (e.key === 'Enter') {
-        this.$refs.paged.$refs.criteria.search()
+
+    dateDiff(date1Str) {
+      // 确保传入的date1Str是有效的字符串格式
+      if (typeof date1Str !== 'string' || !/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(date1Str)) {
+        throw new Error('Invalid date format. Expected format: yyyy-mm-dd hh:mm:ss');
       }
+      // 将date1Str格式化为Date对象，并提取日期部分
+      const date1 = new Date(date1Str);
+      const year = date1.getFullYear();
+      const month = String(date1.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要加1
+      const day = String(date1.getDate()).padStart(2, '0');
+      const formattedDate1 = `${year}-${month}-${day}`;
+      // 获取当前日期，并同样格式化为yyyy-mm-dd
+      const date2 = new Date();
+      const currentYear = date2.getFullYear();
+      const currentMonth = String(date2.getMonth() + 1).padStart(2, '0');
+      const currentDay = String(date2.getDate()).padStart(2, '0');
+      const formattedDate2 = `${currentYear}-${currentMonth}-${currentDay}`;
+      // 将格式化后的日期字符串转换为Date对象，以便比较
+      const formattedDate1Obj = new Date(`${formattedDate1}T00:00:00`); // 添加时间部分以确保比较准确
+      const formattedDate2Obj = new Date(`${formattedDate2}T00:00:00`);
+      // 计算两个日期之间的差值（以毫秒为单位），然后转换为天数
+      const diffInMilliseconds = Math.abs(formattedDate2Obj - formattedDate1Obj);
+      const diffInDays = Math.ceil(diffInMilliseconds / (1000 * 60 * 60 * 24));
+      // 返回天数差
+      return diffInDays;
     },
-    getCheckBook(){
-      this.checkBooks=[]
-      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-        data: {
-          items: 'id,f_check_book_name,f_check_book_type',
-          tablename: 't_check_book',
-          condition: `f_orgid = '${this.$login.f.orgid}'`,
-          orderitem: 'id desc'
-        }
-      }, {resolveMsg: null, rejectMsg: null}).then(res => {
-        this.checkBooks.push({label: '全部', value: ''})
-        res.data.forEach(ress => {
-          this.checkBooks.push({
-            label: ress.f_check_book_name,
-            value: ress.f_check_book_name
-          })
-        })
-      })
-    },
-
-  dateDiff(date1Str) {
-  // 确保传入的date1Str是有效的字符串格式
-  if (typeof date1Str !== 'string' || !/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(date1Str)) {
-    throw new Error('Invalid date format. Expected format: yyyy-mm-dd hh:mm:ss');
-  }
-  // 将date1Str格式化为Date对象，并提取日期部分
-  const date1 = new Date(date1Str);
-  const year = date1.getFullYear();
-  const month = String(date1.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要加1
-  const day = String(date1.getDate()).padStart(2, '0');
-  const formattedDate1 = `${year}-${month}-${day}`;
-  // 获取当前日期，并同样格式化为yyyy-mm-dd
-  const date2 = new Date();
-  const currentYear = date2.getFullYear();
-  const currentMonth = String(date2.getMonth() + 1).padStart(2, '0');
-  const currentDay = String(date2.getDate()).padStart(2, '0');
-  const formattedDate2 = `${currentYear}-${currentMonth}-${currentDay}`;
-  // 将格式化后的日期字符串转换为Date对象，以便比较
-  const formattedDate1Obj = new Date(`${formattedDate1}T00:00:00`); // 添加时间部分以确保比较准确
-  const formattedDate2Obj = new Date(`${formattedDate2}T00:00:00`);
-  // 计算两个日期之间的差值（以毫秒为单位），然后转换为天数
-  const diffInMilliseconds = Math.abs(formattedDate2Obj - formattedDate1Obj);
-  const diffInDays = Math.ceil(diffInMilliseconds / (1000 * 60 * 60 * 24));
-  // 返回天数差
-  return diffInDays;
-},
 //查询二维码
-     searchInfo(val){
+    searchInfo(val){
       this.dialogVisible = true
       //tag
-       new HttpResetClass().load('POST','api/af-safecheck/logic/QrcodeUtil', {
+      new HttpResetClass().load('POST','api/af-safecheck/logic/QrcodeUtil', {
         data: {
           id:val
         }
       },{resolveMsg: null, rejectMsg: null}).then(res=>{
-         //tag
-         //tag
-         let imageer=new Image()
-         imageer.src="data:image/jpg;base64,"+res.data.result
-         document.getElementById("dd").appendChild(imageer);
-         //tag
+        //tag
+        //tag
+        let imageer=new Image()
+        imageer.src="data:image/jpg;base64,"+res.data.result
+        document.getElementById("dd").appendChild(imageer);
+        //tag
       })
 
     },
@@ -862,7 +836,7 @@ export default {
     changeStates() {
       if (this.checkedAll) {//实现反选/
         this.checkrows = [];
-        for (let i = 0; i < c.rows.length; i++) {
+        for (let i = 0; i < this.$refs.paged.model.rows.length; i++) {
           this.$set('$refs.paged.model.rows[' + i + '].checked', false)
         }
       } else {//实现全选