safecheck-client 3.0.33-14 → 3.0.33-140

package/src/components/paper/PlanChooser.vue

@@ -79,8 +79,10 @@
   let selectnew = function * (self) {
     let http = new HttpResetClass()
     http.load('POST', '/rs/search', {
-      source: `root.getResourceById($${self.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
-      userid: self.$login.f.id
+        data:{
+          source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+          userid: self.$login.f.orgid
+        }
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
       self.checkers = []
       let arr = []

package/src/components/planmanage/PlanManage.vue

@@ -16,7 +16,7 @@
                       close-on-select value-single >
             </v-select>
           </div>
-          <div class="row auto safe-div-p"><!--<span style="margin-right: 5px" @click="refresh()" style="cursor:default">测试</span>--><span style="margin-right: 5px" @click="delCheckPlan()" style="cursor:default">删除</span> <span @click="sendCheckPlan()" style="cursor:default">下发</span></div>
+          <div class="row auto safe-div-p"><!--<span style="margin-right: 5px" @click="refresh()" style="cursor:default">测试</span>--><span style="margin-right: 5px" @click="delCheckPlan()" style="cursor:default" v-if="isdelete">删除</span> <span @click="sendCheckPlan()" style="cursor:default">下发</span></div>
         </div>
         <div class="leftplan-center safe_plan_list">
           <div class="row safe-leftplan safe_list_li" :class="{'safe-selectplan':selectPlan.id==row.id}" v-for="row in checkplan.list.data" @click="selectPlanChange(row)">
@@ -399,6 +399,7 @@
             a:'1',
             opt:[{label:"按时间降序",value:"按时间降序"},{label:"按时间升序",value:"按时间升序"}],
             currentorder:'按时间降序',
+            isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
             checkplan : new SearchList(true),
             selectPlan:{id:''},
             upCheckPlan:{
@@ -451,6 +452,13 @@
         },
       async ready(){
         await this.loadpage()
+        if (!this.userlogin.orgid){
+          if (this.$login.f.f_orgids){
+            this.userlogin.orgid = this.$login.f.f_orgids.endsWith('.')?this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1):this.$login.f.f_orgids
+          }else {
+            this.userlogin.orgid = ''
+          }
+        }
       },
    computed: {
         ntoway() {
@@ -575,8 +583,10 @@
         //查询安检员selectChanged
         async searchChecker(id){
           let res=await new HttpResetClass().load('POST', '/rs/search', {
-            source: `root.getResourceById($${this.userlogin.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
-            userid: this.$login.f.id
+            data:{
+              source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+              userid: this.userlogin.orgid
+            }
           }, {resolveMsg: null, rejectMsg: null})
           let arr = []
           res.data.forEach((resRow) => {
@@ -727,7 +737,7 @@
           this.isSend=true
           let res=await new HttpResetClass().load("POST", "/rs/logic/deleteCheckPlan", {
             data:{
-              f_operator:this.userlogin.orgstr,//global.login.name,
+              f_operator:this.userlogin.name,//global.login.name,
               condition:"",
               switchCheckAll:true,
               checkAll:false,

package/src/components/planmanage/checkPlanList.vue

@@ -50,7 +50,7 @@
             </div>
             <div class="form-group col-sm-2" style="float: right">
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.showplanModal()">计划调整</button>
-              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()">移出计划</button>
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()" v-show="$parent.$parent.isdelete">移出计划</button>
             </div>
             <modal :show.sync="$parent.$parent.showCondtion" v-ref:modal :width="'50%'" :backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -178,6 +178,7 @@
     data() {
       return {
         model:new PagedList('/rs/sql/planItem', 100, {}),
+        isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
         a:'1',
         opt:[{label:"测试",value:"测试"}],
         showCondtion:false,

package/src/components/planmanage/checkUserList.vue

@@ -371,6 +371,7 @@
             <th><nobr>抄表册</nobr></th>
             <th title="当前所在的安检计划名称"><nobr>所属计划</nobr></th>
             <th title="最后一次安检日期"><nobr>安检日期</nobr></th>
+            <th><nobr>首次通气时间</nobr></th>
             <th><nobr>详细地址</nobr></th>
           </tr>
         </template>
@@ -386,6 +387,7 @@
           <td style="text-align: center"><nobr>{{row.f_book_name}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_plan_name}}</nobr></td>
           <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>
         </template>
       </data-grid>

package/src/components/report/HiddenSituation.vue

@@ -51,9 +51,9 @@
                 v-model='model.userType'
                 :value.sync="model.userType"
                 :options='$parent.$parent.userTypes'
-                condition="tuf.f_gasproperties = '{}'"
-                :value-single="true"
-                close-on-select clear-button></v-select>
+                condition="tuf.f_gasproperties in {} "
+                :multiple="true"
+               ></v-select>
             </div>
             <div class="col-sm-2 form-group" >
               <label class="font_normal_body">气表类型</label>