safecheck-client 3.0.33-18 → 3.0.33-19

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

@@ -7,12 +7,12 @@
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">用户编号</label>
               <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
-                     condition="f_userinfo_code = '{}'" placeholder='用户编号'>
+                     condition="f_userinfo_code like '%{}%'" placeholder='用户编号'>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">用户姓名</label>
               <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
-                     condition="f_user_name = '{}'" placeholder='用户姓名'>
+                     condition="f_user_name like '%{}%'" placeholder='用户姓名'>
             </div>
 
             <div class="form-group button-range" style="float: right">
@@ -73,10 +73,10 @@
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">所属表册</label>
-              <v-select :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
+              <v-select :value.sync="model.f_check_book_num" v-model="model.f_check_book_num"
                         :options='$parent.$parent.meterbooks' placeholder='安检册'
                         :value-single="true"
-                        condition="f_meter_book_num='{}'"
+                        condition="f_check_book_num='{}'"
                         style="width:60%"
                         close-on-select></v-select>
             </div>
@@ -335,6 +335,7 @@ export default {
   ready () {
     getAreaConfig(this)
     loadParamGem(this)
+    this.getmeterbook()
   },
   methods: {
     async meterbook(){
@@ -342,11 +343,11 @@ export default {
       if(this.f_orgid==''){
         this.f_orgid=this.$login.f.orgid
       }
-      let res=await this.$resetpost('api/af-revenue/sql/saleSingleTable',{data:{tablename:'t_meter_book',condition:` 1=1 and f_orgid=${this.f_orgid} and f_book_state='有效'`}},{resolveMsg:null,rejectMsg:null})
+      let res=await this.$resetpost('rs/sql/tel_singleTable_OrderBy',{data:{items:' * ',tablename:'t_check_book',condition:` 1=1 `,orderitem:' id desc'}},{resolveMsg:null,rejectMsg:null})
       for(let i=0;i<res.data.length;i++){
         console.log("res",res.data[i])
         let temp=[]
-        temp.label=res.data[i].f_book_name
+        temp.label=res.data[i].f_check_book_name
         temp.value=res.data[i].id
         this.meterbooks.push(temp)
       }
@@ -406,7 +407,7 @@ export default {
       })
       this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
       //
-      // // 加载抄表册
+      // // 加载安检册
       // console.log("------------------this.$GetSaleParam.getMeterBooks()",this.$GetSaleParam.getMeterBooks())
       // this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
     },

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

@@ -231,6 +231,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">
@@ -776,7 +791,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,

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

@@ -81,32 +81,32 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4">
+                  <div class="col-sm-3 form-group">
                     <label class="font_normal_body">街道/乡镇</label>
-                    <v-select :value.sync="model.f_street" :value-single="true"
+                    <v-select :value.sync="model.f_street_id" :value-single="true"
                               :options='$parent.$parent.streetslist' placeholder='请选择'
-                              condition="f_street = '{}'"
-                              v-model='model.f_street'
+                              condition=" area.f_street_id = '{}'"
+                              v-model='model.f_street_id'
                               @change="$parent.$parent.streetChange"
                               close-on-select :search="true" >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4">
+                  <div class="col-sm-3 form-group">
                     <label class="font_normal_body">片区/行政村</label>
-                    <v-select :value.sync="model.f_community" v-model='model.f_community'
+                    <v-select :value.sync="model.f_community_id" v-model='model.f_community_id'
                               :options='$parent.$parent.communitylist' placeholder='片区/管理站' filer-key="name"
-                              condition="f_community = '{}'"
+                              condition="ua.f_community_id = '{}'"
                               @change="$parent.$parent.communityChange"
-                              close-on-select >
+                              close-on-select v-ref:slice>
                     </v-select>
                   </div>
-                  <div  class="form-group col-sm-4">
+                  <div  class="col-sm-3 form-group">
                     <label class="font_normal_body">小区/自然村</label>
-                    <v-select :value.sync="model.f_residential_area" :value-single="true"
+                    <v-select :value.sync="model.f_residential_area_id" :value-single="true"
                               :options='$parent.$parent.areaslist' placeholder='请选择'
-                              condition="f_residential_area = '{}'"
-                              v-model='model.f_residential_area'
-                              close-on-select >
+                              condition="ua.f_residential_area_id = '{}'"
+                              v-model='model.f_residential_area_id'
+                              close-on-select>
                     </v-select>
                   </div>
                   <div class="form-group col-sm-4" >
@@ -382,7 +382,8 @@
         uploadCodeCondition:'',
         streetslist:[],
         communitylist:[],
-        areaslist:[]
+        areaslist:[],
+        f_filialeids: this.$login.f.orgid,
       }
     },
     props:["selectplan","userlogin"],
@@ -416,7 +417,7 @@
         req.data.forEach((row, n) => {
           redata[n] = {
             label: row.f_pcd,
-            value: row.f_pcd,
+            value: row.id,
             data: row,
             id: row.id
           }
@@ -442,7 +443,7 @@
         req.data.forEach((row, n) => {
           redata[n] = {
             label: row.f_street,
-            value: row.f_street,
+            value: row.id,
             data: row,
             id: row.id
           }
@@ -471,7 +472,7 @@
         req.data.forEach((row) => {
           redata.push({
             label: row.f_residential_area,
-            value: row.f_residential_area,
+            value: row.id,
             data: row,
             id: row.id
           })
@@ -490,20 +491,20 @@
           }
         }
         if (selectArea) {
-          this.model.f_street = selectArea.f_street
-          this.model.f_pcd = selectArea.f_pcd
-          this.model.f_community = selectArea.f_community
-          console.log( this.model.f_community)
+          this.model.f_street_id = selectArea.f_street_id
+          this.model.f_pcd_id = selectArea.f_pcd_id
+          this.model.f_community_id = selectArea.f_community_id
+          console.log( this.model.f_community_id)
 
-          this.initstreets(` f_filialeid = '${this.userlogin.orgid}' and id ='${selectArea.f_street}' `)
-          this.initpcds(` f_filialeid = '${this.userlogin.orgid}' and id ='${selectArea.f_pcd}' `)
-          if(selectArea.f_community){
-            this.initcommunity(` f_filialeid = '${this.userlogin.orgid}' and id ='${selectArea.f_community}' `)
+          this.initstreets(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_street_id}' `)
+          this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `)
+          if(selectArea.f_community_id){
+            this.initcommunity(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_community_id}' `)
           }
           // this.model.f_slice_area = selectArea.f_slice_area
           // 拼接地址
           this.model.f_address = `${selectArea.f_street}${selectArea.f_community}${selectArea.f_residential_area}`
-          console.log( this.model.f_community)
+          console.log( this.model.f_community_id)
         }
         this.$nextTick(() => {
           this.$resetValidation()
@@ -524,14 +525,14 @@
         if (val) {
           // 那就把[小区]重新组织一下
           await this.initareas(` f_area_code ='${val}' `)
-          if (this.$refs.paged.$refs.criteria.model.f_residential_area) {
-            if (this.findbyid(this.areaslist, this.$refs.paged.$refs.criteria.model.f_residential_area)) {
-              let street = this.findbyid(this.areaslist,this.$refs.paged.$refs.criteria.model.f_residential_area).f_street
-              if (street != val) {
-                this.$refs.paged.$refs.criteria.model.f_residential_area = ''
+          if (this.$refs.paged.$refs.criteria.model.f_residential_area_id) {
+            if (this.findbyid(this.areaslist, this.$refs.paged.$refs.criteria.model.f_residential_area_id)) {
+              let street_id = this.findbyid(this.areaslist,this.$refs.paged.$refs.criteria.model.f_residential_area_id).f_street_id
+              if (street_id != val) {
+                this.$refs.paged.$refs.criteria.model.f_residential_area_id = ''
               }
             } else {
-              this.$refs.paged.$refs.criteria.model.f_residential_area = ''
+              this.$refs.paged.$refs.criteria.model.f_residential_area_id = ''
             }
           }
         }
@@ -562,13 +563,13 @@
       },
       async streetChange(val){
         if(val){
-          await this.initcommunity(` f_filialeid = '${this.userlogin.orgid}' and f_street ='${val}' `)
+          await this.initcommunity(` f_filialeid = '${this.f_filialeids}' and f_street_id ='${val}' `)
         }
       },
       async  communityChange(val){
         console.log(val)
         if(val){
-          await this.initareas(` f_filialeid = '${this.userlogin.orgid}' and f_community ='${val}' `)
+          await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
         }
       },
       getCommunity(){