safecheck-client 4.0.2-3 → 4.0.2-31

package/src/components/planmanage/checkUserList.vue

@@ -406,7 +406,7 @@ export default {
   data() {
     return {
       model:new PagedList('/api/af-safecheck/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
-        "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
+        "orderitem": "'f_address desc'",
         "f_usertype": "''",
         "month": "''",
         "SafeCheckSX": {"f_check_start": '', "f_check_end": ''},

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -787,7 +787,8 @@ export default {
       con += args.model.f_checker_id ? ` and f_checker_name in ${args.model.f_checker_id}` : ' and 1=1'
       let condition = {
         condition1: args.condition,
-        condition2: con
+        condition2: con,
+        condition3: '1 = 1'
       }
       this.searchData.condition = condition
       return this.model.search(condition, args.model)

package/src/components/report/CheckByPlan.vue

@@ -78,7 +78,7 @@
   export default {
     title: '安检员安检情况报表',
     data() {
-      let model = new DataModel('/rs/report/checkByPlan')
+      let model = new DataModel('/api/af-safecheck/report/checkByPlan')
       model.f_filialeid = this.$login.f.orgid
       return {
         filialeNameStr: '',

package/src/components/report/CheckPlanAreaList.vue

@@ -41,6 +41,18 @@
                         close-on-select clear-button></v-select>
 
             </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
+              <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='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
             <!--<div  :class="{
             'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">安&ensp;检&ensp;员</label>
@@ -108,6 +120,8 @@
               <label for="f_checker_name">安检员</label>
               <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
               <label for="f_checker_name">档案数量</label>
+              <input type="checkbox" id="f_safecheck_type" value="f_safecheck_type" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_checker_name">安检类型</label>
             </div>
           </div>
         </div>
@@ -125,6 +139,7 @@
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')"><nobr>计划名称</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')"><nobr>安检员</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')"><nobr>档案数量</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_safecheck_type')"><nobr>安检类型</nobr></th>
             <th>
               <nobr>计划总数</nobr>
             </th>
@@ -165,6 +180,7 @@
             <td style="text-align:center" :class="{'td-0':row.f_plan_name==undefined,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')">{{row.f_plan_name.indexOf('*&')!=-1?'':row.f_plan_name}}</td>
             <td style="text-align:center" :class="{'td-0':row && !row.f_checker_name,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_checker_name && row.f_checker_name.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql && $parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name && row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_safecheck_type')">{{row.f_safecheck_type}}</td>
             <td style="text-align:center">{{row.f_plan_total}}</td>
             <td style="text-align:center">{{row.f_weijian}}</td>
             <td style="text-align:center"><nobr>{{row.f_yijian}}</nobr></td>
@@ -209,6 +225,7 @@ export default {
       row: {},
       f_orgid: '',
       nameForSql: [],
+      sliceArea: [],
       groupNameForSql: '',
       listflag:false,
       nameflag:false,
@@ -239,9 +256,32 @@ export default {
     this.groupNameForSql = 'f_plan_month', 'f_plan_name','f_checker_name'
     this.pl()
     // this.search()
+    this.Mreadibook(this.$login.f.orgid)
 
   },
   methods: {
+    Mreadibook(val){
+      if (val){
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
+            items: 'name',
+            tablename: 't_zone',
+            condition: `parentid = '${val}'`,
+            orderitem: 'id'
+          }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.sliceArea=[]
+          this.sliceArea.push({
+            label:'全部',
+            value:''
+          })
+          res.data.forEach(ress=>{
+            this.sliceArea.push({
+              label:ress.name,
+              value:ress.name
+            })
+          })
+        })
+      }
+    },
     exportexcel(){
       //tag
 // 以上四行也可以直接一行搞定，如果不需要对表格数据进行修改的话
@@ -284,6 +324,9 @@ export default {
         }if (ff==='f_user_number') {
           this.exportExcelField.f_user_number='档案数量'
         }
+        if (ff==='f_safecheck_type') {
+          this.exportExcelField.f_safecheck_type='安检类型'
+        }
       }
     },
     pl() {
@@ -359,7 +402,7 @@ export default {
 
     // 拼接groupName1
     getGroupName1 () {
-      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number','f_safecheck_type']
       var newtemp=[]
 
       for (var i=0;i<temp.length;i++){
@@ -396,7 +439,7 @@ export default {
       }
       this.listflag=true
       //tag
-      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number','f_safecheck_type']
       var newtemp=[]
       for (var i=0;i<temp.length;i++){
         for (var j=0;j<this.nameForSql.length;j++){

package/src/filiale/jinhong/android/CurrentCreate.vue

@@ -667,7 +667,9 @@ export default {
       notVisited: 0,
       checked: 0,
       notChecked: 0,
-      enterRate: 0
+      enterRate: 0,
+      ruhunum:0
+
     }
   },
   ready() {
@@ -1210,8 +1212,8 @@ export default {
         }
       }
       let tjData = {
-        items: " COUNT(*) AS total_items, SUM(CASE WHEN tcpi.f_last_check_state= '到访不遇' THEN 1 ELSE 0 END) AS no_answer_count, SUM(CASE WHEN tcpi.f_state='已检' THEN 1 ELSE 0 END) AS yj_count, SUM(CASE WHEN tcpi.f_state='未检' THEN 1 ELSE 0 END) AS wj_count, ROUND(SUM(CASE WHEN tcp.f_entry_status='入户' THEN 1 ELSE 0 END)*100.0/COUNT(*),2) AS entry_rate_percent ",
-        tablename: " t_check_plan tcpl LEFT JOIN t_check_plan_item tcpi ON tcpl.id=tcpi.f_plan_id LEFT JOIN t_check_paper tcp ON tcp.f_check_item_id= tcpi.id ",
+        items: " COUNT(*) AS total_items,SUM ( CASE WHEN  tcpi.f_state= '已检'  and tcpi.f_last_check_state= '到访不遇' THEN 1 ELSE 0 END ) AS no_answer_count,SUM ( CASE WHEN  tcpi.f_state= '已检'  and tcpi.f_last_check_state= '入户' THEN 1 ELSE 0 END ) AS ruhunum,SUM ( CASE WHEN tcpi.f_state= '已检' AND f_last_check_state != '到访不遇' THEN 1 ELSE 0 END ) AS yj_count,SUM ( CASE WHEN tcpi.f_state= '未检' THEN 1 ELSE 0 END ) AS wj_count,ROUND( SUM ( CASE WHEN  tcpi.f_state= '已检'  and tcpi.f_last_check_state= '入户' THEN 1 ELSE 0 END ) * 100.0 / COUNT ( * ), 2 ) AS entry_rate_percent  ",
+        tablename: " t_check_plan tcpl LEFT JOIN t_check_plan_item tcpi ON tcpl.id=tcpi.f_plan_id ",
         condition: condition,
         orderitem: '1'
       }
@@ -1226,6 +1228,7 @@ export default {
         this.checked = stat.yj_count || 0;
         this.notChecked = stat.wj_count || 0;
         this.enterRate = stat.entry_rate_percent || 0;
+        this.ruhunum = stat.ruhunum || 0;
       }
 
       let criteria = {

package/src/filiale/jinhong/android/PhoneInsurancePurchaseDetail.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="auto clearfix">
+    <work-busy :is-busy="isbusy"></work-busy>
     <div class="row app-row col-xs-12 col-sm-6 col-md-6">
       <div class="col-xs-4 col-sm-4 col-md-4">
         <img alt="" src="../../../assets/add.png" style="width: 20px;margin-bottom: 5px">
@@ -190,7 +191,7 @@
       </div>
     </div>
     <div class="col-xs-12 text-center  app-row">
-      <button class="btn btn-lg btn-font btn-color" style="width: 22%;" type="button" @click="commit()">提交</button>
+      <button class="btn btn-lg btn-font btn-color" style="width: 22%;" type="button" @click="check()">提交</button>
     </div>
   </div>
 </template>
@@ -204,7 +205,7 @@ export default {
   data() {
     return {
       create_date: Util.getNowDate(),
-      isCommit: false,
+      isbusy: false,
       insurance_types: [{label: '请选择', value: ''}, ...this.$appdata.getParam('险种')],
       insurance_companys: [{label: '请选择', value: ''}, ...this.$appdata.getParam('保险公司')],
       payTypes: [{label: '请选择', value: ''}, ...this.$appdata.getParam('付款方式')],
@@ -269,6 +270,27 @@ export default {
     this.model.f_id_type = '身份证'
   },
   methods: {
+    //查询是否在今天已经操作过了
+    async check() {
+      let http = new HttpResetClass()
+      // 获取今天的开始和结束时间
+      let startOfDay =Util.toStartDateString() + ' 00:00:00'
+      let endOfDay =Util.toEndDateString() + ' 23:59:59'
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: 'id',
+          tablename: 't_userfees',
+          condition: `f_userinfo_id= '${this.model.f_userinfo_id}' and f_state='有效' and f_fee_type='保险收费' and f_operate_date >= '${startOfDay}' and f_operate_date <= '${endOfDay}'`,
+          orderitem: 'id'
+        }
+      }, { resolveMsg: null, rejectMsg: null }).then((res) => {
+        if (res.data.length > 0) {
+          this.$showMessage('今天已经进行了保险收费，请勿重复操作。')
+        } else {
+          this.commit()
+        }
+      })
+    },
     async commit() {
       if (!this.model.f_payment) {
         this.$showMessage('收款方式未选择，请选择后重新尝试。')
@@ -353,6 +375,7 @@ export default {
             return
           }
         }
+        this.isbusy= true
         commit_data.f_receivable = this.model.f_money
         commit_data.f_operate_date = Util.toStandardTimeString()
         commit_data.f_state = '有效'
@@ -360,12 +383,14 @@ export default {
         commit_data.f_orgname = Vue.user.orgs
         commit_data.f_depid = Vue.user.depids
         commit_data.f_depname = Vue.user.deps
+        commit_data.f_fee_type='保险收费'
         await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/saveInsInfo`, {data: commit_data})
         this.$showMessage('提交成功')
+        this.isbusy= false
         this.$back()
       } catch (error) {
         this.$showMessage('提交失败')
-        this.isCommit = false
+        this.isbusy= false
       }
     },
     changeExpirationDate() {

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

@@ -26,24 +26,30 @@
                         :options='$parent.$parent.checkBooks' placeholder='安检册名称'
                         condition="tcb.id in {}"></v-select>
             </div>
-            <!--            <div :class="$parent.$parent.style">-->
-            <!--              <label class="font_normal_body">表册类型</label>-->
-            <!--              <v-select :value.sync="model.f_check_book_type" v-model='model.f_check_book_type'-->
-            <!--                        :value-single="true" style="width: 60%"-->
-            <!--                        class="select_list select"-->
-            <!--                        :options='$parent.$parent.bookTypes' placeholder='表册类型'-->
-            <!--                        close-on-select-->
-            <!--                        condition="tcb.f_check_book_type ='{}'"></v-select>-->
-            <!--            </div>-->
-            <!--            <div :class="$parent.$parent.style">-->
-            <!--              <label class="font_normal_body">用户类型</label>-->
-            <!--              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'-->
-            <!--                        :value-single="true" style="width: 60%"-->
-            <!--                        class="select_list select"-->
-            <!--                        :options='$parent.$parent.userTypes' placeholder='用户类型'-->
-            <!--                        close-on-select-->
-            <!--                        condition="tcb.f_user_type ='{}'"></v-select>-->
-            <!--            </div>-->
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">开始时间</label>
+              <datepicker
+                :value.sync="model.f_check_start"
+                placeholder='最后一次下发开始时间'
+                style="width: 60%"
+                :format="'yyyy-MM-dd 00:00:00'"
+                :show-rest-button="reset"
+                v-model="model.f_check_start"
+                condition="lasttime.last_check_time > '{}'">
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">结束时间</label>
+              <datepicker
+                :value.sync="model.f_check_end"
+                placeholder='最后一次下发截止时间'
+                style="width: 60%"
+                :format="'yyyy-MM-dd 23:59:59'"
+                :show-rest-button="reset"
+                v-model="model.f_check_end"
+                condition="lasttime.last_check_time < '{}'">
+              </datepicker>
+            </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <button type="button" class="button_search button_spacing" @click="$parent.$parent.clean()">重置</button>
@@ -129,6 +135,9 @@
             <th>
               <nobr>未下发</nobr>
             </th>
+            <th>
+              <nobr>最后下发时间</nobr>
+            </th>
 <!--            <th>
               <nobr>已检</nobr>
             </th>
@@ -150,6 +159,7 @@
           <td  style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num}}</b></button></td>
           <td  style="text-align: center;">{{ row.xiafa }}</td>
           <td  style="text-align: center;">{{ row.f_user_type =='民用'?row.num-row.xiafa:row.num4-row.xiafa }}</td>
+          <td  style="text-align: center;">{{ row.last_check_time }}</td>
 <!--          <td  style="text-align: center;">{{ row.yijian }}</td>
           <td  style="text-align: center;">{{ row.weijian }}</td>-->
           <!--          <td  v-show="row.f_check_book_type!='小区'" style="text-align: center;"><button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.send(row)'>下发</button></td>-->

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"   >

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/meihekou/android/CurrentCreate.vue

@@ -215,6 +215,17 @@
                         v-model="model.f_last_state"
                         close-on-select clear-button></v-select>
             </div>
+            <div class="row app-row" v-show="$parent.$parent.criteriaShow">
+              <div class="col-xs-4">
+                <img src="../../../assets/上传状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_upload_state" class="font text-left">上传状态：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select id="f_upload_state" :value.sync="model.f_upload_state" class="input-font"
+                          :options='$parent.$parent.upload_states' placeholder='请选择上传状态'
+                          v-model="model.f_upload_state" condition="ti.f_upload_state='{}'" close-on-select clear-button></v-select>
+              </div>
+            </div>
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-6">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -856,6 +867,11 @@ export default {
         condition += " and ti.f_enter_number like '%"+this.$refs.paged.$refs.cri.model.f_enter_number+"%'"
       if(this.$refs.paged.$refs.cri.model.f_check_version)
         condition += " and ti.f_check_version <= "+this.$refs.paged.$refs.cri.model.f_check_version
+
+      if(this.$refs.paged.$refs.cri.model.f_upload_state[0])
+        condition += ` and ti.f_upload_state = '${this.$refs.paged.$refs.cri.model.f_upload_state[0]}'`
+
+
       //tag
       this.model.search("ti.f_no_checkplan = '有计划安检'" + condition)
     },

package/src/filiale/meihekou/android/SafecheckDevices.vue

@@ -632,9 +632,12 @@ export default {
                   continue
                 }
                 let type = this.config[this.device.device].items[item].type
-                let multiple = this.config[this.device.device].items[item].multiple?this.config[this.device.device].items[item].multiple:false
+                let multiple = false
+                if(this.config[this.device.device].items[item].multiple){
+                  multiple = this.config[this.device.device].items[item].multiple === 'true' || this.config[this.device.device].items[item].multiple === true
+                }
                 let options = this.config[this.device.device].items[item].options
-                if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && item == this.f_items[n].f_item_name) {
+                if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && this.config[this.device.device].items[item].itemname == this.f_items[n].f_item_name) {
                   for (let i in options) {
                     if(typeof options[i]=='function'){
                       continue
@@ -1043,7 +1046,7 @@ export default {
         verification_text:'',
         verification_state:'',// ai验证是否通过 npass(未通过)/pass(通过)
         f_is_defect: '',
-        multiple:this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
+        multiple:this.config[this.device.device].items[item].multiple === 'true' || this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
         isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
         readonly: this.config[this.device.device].items[item].readonly == true?true:false,
         remark: this.config[this.device.device].items[item].remark ? this.config[this.device.device].items[item].remark : '',