safecheck-client 4.0.0-99 → 4.0.1-1

package/src/components/paper/RegionalList.vue

@@ -19,10 +19,10 @@
                           close-on-select
                           condition="f_name = '{}'"></v-select>
               </div>
-
               <div class="form-group col-sm-2"  >
                 <label class="font_normal_body">调压箱</label>
                 <v-select :value.sync="model.f_adjustable_id" v-model='model.f_adjustable_id'
+
                           :value-single="true" style="width: 60%"
                           class="select_list select"
                           :options='$parent.$parent.boxOptions' placeholder='调压箱'
@@ -32,10 +32,11 @@
               <div class="form-group col-sm-2" >
                 <label class="font_normal_body">安检时间</label>
                 <datepicker
+                  :default="true"
                   :value.sync="model.start"
                   placeholder='开始时间' style="width: 60%"
                   :disabled-days-of-week="[]"
-                  :format="'yyyy-MM-dd'"
+                  :format="'yyyy-MM-dd 00:00:00'"
                   :show-rest-button="reset"
                   v-model="model.start"
                   >
@@ -44,10 +45,11 @@
               <div class="form-group col-sm-2" >
                 <label class="font_normal_body">安检时间</label>
                 <datepicker
+                  :default="true"
                   :value.sync="model.end"
                   placeholder='结束时间' style="width: 60%"
                   :disabled-days-of-week="[]"
-                  :format="'yyyy-MM-dd'"
+                  :format="'yyyy-MM-dd 23:59:00'"
                   :show-rest-button="reset"
                   v-model="model.end">
                 </datepicker>
@@ -124,6 +126,7 @@
 
 <script>
 import {HttpResetClass, PagedList} from 'vue-client'
+import * as Util from "util";
 export default {
   title: '安检区域汇总',
   data() {
@@ -171,12 +174,12 @@ export default {
           const boxOptions =[{label: '全部', value: ''}]
           for (const data of res.data) {
             const one = {
-              label: data.f_adjustable_id + data.f_adjustable_name,
-              value: Number(data.f_adjustable_id)
+              label: data.f_adjustable_name,
+              value: data.id
             }
             boxOptions.push(one)
           }
-          this.boxOptions = JSON.parse(JSON.stringify(boxOptions))
+          this.boxOptions = boxOptions
         }).catch((msg) => {
         })
       },

package/src/components/pc/AddToCheckBook.vue

@@ -73,7 +73,7 @@
       new HttpResetClass().load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=9999999',{data: {
           items: 'id,f_check_book_name,f_check_book_type,f_user_type',
           tablename: 't_check_book',
-          condition: `1=1`,
+          condition: `1=1 and f_orgid = ${this.$login.f.orgid}`,
           orderitem: 'id'
         }}, {resolveMsg: null, rejectMsg: null}).then(res=>{
         console.log("checkbook", res.data)