safecheck-client 3.0.31-gongyi → 3.0.32-10

package/src/components/planmanage/PlanManage.vue

@@ -22,7 +22,7 @@
           <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)">
             <table style="width:100%;table-layout:fixed" >
               <tr class="safe-planfont">
-                <td rowspan="4"><input type="checkbox" style="pointer-events:auto" v-show="row.plan_count==0 || row.f_issued=='未下发'"  onClick="event.cancelBubble = true" :checked="checkplan.check.isChecked(row.f_check_item_id)"  @change="checkplan.check.setCheckes(row.id)"/></td>
+                <td rowspan="6"><input type="checkbox" style="pointer-events:auto" v-show="row.plan_count==0 || row.f_issued=='未下发'"  onClick="event.cancelBubble = true" :checked="checkplan.check.isChecked(row.f_check_item_id)"  @change="checkplan.check.setCheckes(row.id)"/></td>
                 <td colspan="6" class="safe_p">{{row.f_plan_name}}</td>
                 <td colspan="2" style="text-align: center"><img width="20px" style="pointer-events:auto" onClick="event.cancelBubble = true" @click="showUpPlans(row)" src="../../../static/images/edit.png"/></td>
               </tr>
@@ -41,6 +41,14 @@
                 <td colspan="2">已检 :</td>
                 <td colspan="2">{{row.checked}}</td>
               </tr>
+              <tr class="safe-bodyfont" v-if="row.f_create_time">
+                <td colspan="3">创建时间 :</td>
+                <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="row.f_create_time">{{row.f_create_time}}</td>
+              </tr>
+              <tr class="safe-bodyfont" v-if="row.f_safecheck_type">
+                <td colspan="3">安检类型 :</td>
+                <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="row.f_safecheck_type">{{row.f_safecheck_type}}</td>
+              </tr>
             </table>
           </div>
         </div>
@@ -177,6 +185,11 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">创&ensp;建&ensp;人:</label>
+              <input type="text" class="input_search" v-model="planCondition.f_create_operator"  @change="setProperty('checkplan','f_create_operator',planCondition.f_create_operator)"
+                     style="width: 60%" placeholder="创建人" />
+            </div>
           </div>
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -259,7 +272,7 @@
                 :value.sync="createPlan.f_safecheck_type"
                 v-model="createPlan.f_safecheck_type"
                 :search="false"
-                :options='safechecktype'
+                :options='ntoway'
                 placeholder='请选择'
                 close-on-select
                 value-single
@@ -288,16 +301,28 @@
             </div>
             <div class="form-group col-sm-4" >
               <label class="font_normal_body">计划年份:</label>
-              <v-select
+           <v-select
                 class="select select_list"
                 :value.sync="upCheckPlan.f_plan_year"
                 v-model="upCheckPlan.f_plan_year"
                 :search="false"
+                :value="upCheckPlan.f_plan_year"
                 :options='yearList'
+
                 close-on-select
-                value-single
-              >
+                value-single>
+
+
               </v-select>
+<!--              <datepicker
+                placeholder='请选择'
+                style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy'"
+                :show-rest-button="reset"
+                :value.sync="upCheckPlan.f_plan_year"
+                v-model="upCheckPlan.f_plan_year">
+              </datepicker>-->
             </div>
             <div class="form-group col-sm-4" >
               <label class="font_normal_body">计划月份:</label>
@@ -305,13 +330,27 @@
                 class="select select_list"
                 :value.sync="upCheckPlan.f_plan_month"
                 v-model="upCheckPlan.f_plan_month"
-                :search="false"
+
                 :options='monthList'
                 close-on-select
                 value-single>
               </v-select>
             </div>
-            <div class="form-group col-sm-4">
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">是否共享:</label>
+              <v-select
+                class="select select_list"
+                :search="false"
+                :value.sync="upCheckPlan.isShare"
+                v-model="upCheckPlan.isShare"
+                :options='isAndNot'
+                placeholder='请选择'
+                close-on-select
+                value-single
+              >
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
                 class="select select_list"
@@ -323,6 +362,19 @@
               >
               </v-select>
             </div>
+
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">安检类型:</label>
+              <v-select
+                class="select select_list"
+                :value.sync="upCheckPlan.f_safecheck_type"
+                v-model="upCheckPlan.f_safecheck_type"
+                :options='ntoway'
+                close-on-select
+                value-single
+              >
+              </v-select>
+            </div>
           </div>
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -337,6 +389,7 @@
     import {SearchList,HttpResetClass, PagedList} from "vue-client";
     import * as Util from "../Util";
     import Vue from "vue";
+    import AppData from "../../stores/AppData";
 
     export default {
         name: "PlanManage",
@@ -350,9 +403,11 @@
             selectPlan:{id:''},
             upCheckPlan:{
               f_plan_name:'',
+              f_safecheck_type:'',
               f_plan_year:'',
               f_plan_month:'',
               f_checker_id:'',
+              isShare:'',
               f_checker:'',
               checker:{}
             },
@@ -374,8 +429,8 @@
             showUpPlan:false,
             isAndNot:[{label:'是',value:'是'},{label:'否',value:'否'}],
             conIsAndNot:[{label:'是',value:'is null'},{label:'否',value:'is not null'}],
-            yearList:[{label:"2020",value:"2020"},{label:"2021",value:"2021"},{label:"2022",value:"2022"},{label:"2023",value:"2023"},{label:"2024",value:"2024"},{label:"2025",value:"2025"},{label:"2026",value:"2026"},{label:"2027",value:"2027"},{label:"2028",value:"2028"},{label:"2029",value:"2029"},{label:"2030",value:"2030"}],
-            monthList:[{label:"1",value:"1"},{label:"2",value:"2"},{label:"3",value:"3"},{label:"4",value:"4"},{label:"5",value:"5"},{label:"6",value:"6"},{label:"7",value:"7"},{label:"8",value:"8"},{label:"9",value:"9"},{label:"10",value:"10"},{label:"11",value:"11"},{label:"12",value:"12"}],
+            yearList:[{label:2020,value:2020},{label:2021,value:2021},{label:2022,value:2022},{label:2023,value:2023},{label:2024,value:2024},{label:2025,value:2025},{label:2026,value:2026},{label:2027,value:2027},{label:2028,value:2028},{label:2029,value:2029},{label:2030,value:2030}],
+            monthList:[{label:"1",value:1},{label:"2",value:2},{label:"3",value:3},{label:"4",value:4},{label:"5",value:5},{label:"6",value:6},{label:"7",value:7},{label:"8",value:8},{label:"9",value:9},{label:"10",value:10},{label:"11",value:11},{label:"12",value:12}],
             safechecktype:[{label:'年度普检',value:'年度普检'}],
             checker:[],
             checkertCon:[],
@@ -397,7 +452,17 @@
       async ready(){
         await this.loadpage()
       },
+   computed: {
+        ntoway() {
+         /*/!* return AppData.getParam('安检类型')*!/*/
+          return this.$appdata.getParam('安检类型')
+        }
+        },
       methods:{
+      /*  ntoway() {
+          /!* return AppData.getParam('安检类型')*!/
+          return Vue.$appdata.getParam('安检类型')
+        },*/
         async loadpage(){
           //await this.checkplan.searchList("/rs/sql/预约计划下发", {},{groupitem:"",f_filialeids:"('"+this.userlogin.orgid+"')",orderitem:"f_create_time desc"})
           await this.loadCheckPlan()
@@ -473,7 +538,8 @@
               f_checker_id:null,
               checker:{},
               f_checker:null,
-              f_safecheck_type:''
+              f_safecheck_type:'',
+              f_create_operator:''
           }
           await this.loadCheckPlan()
           this.isSend=false
@@ -509,14 +575,15 @@
         //查询安检员selectChanged
         async searchChecker(id){
           let res=await new HttpResetClass().load('POST', '/rs/search', {
-            source: 'tool.getChildrenOfResName($安检员$)',
-            userid: id
+            source: `root.getResourceById($${this.userlogin.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+            userid: this.$login.f.id
           }, {resolveMsg: null, rejectMsg: null})
-          this.checker=[]
+          let arr = []
           res.data.forEach((resRow) => {
-            if(resRow.orgid==this.userlogin.orgid){
-              this.checker.push({label:resRow.name,value:resRow})
-            }
+              if (!arr.includes(resRow.name) && resRow.state == '在职'){
+                arr.push(resRow.name)
+                this.checker.push({label:resRow.name,value:resRow})
+              }
           })
         },
         //设置属性值
@@ -547,10 +614,11 @@
             {"f_plan_name": "f_plan_name like '%{}%'",
               "f_plan_year":"f_plan_year={}",
               "f_plan_month":"f_plan_month={}",
-              "checkerid":"f_checker_id={}",
+              "checkerid":"f_checker_id='{}'",
               "isAndNot":"f_checker {}",
               "safechecktype":"f_safecheck_type='{}'",
-              "issude":"f_issued = '{}'"
+              "issude":"f_issued = '{}'",
+              "f_create_operator": "f_create_operator like '%{}%'"
             },
             {orderitem:fieldValue,
               f_filialeids:"('"+this.userlogin.orgid+"')",
@@ -568,11 +636,13 @@
         },
         showUpPlans(row){
           this.upCheckPlan.id=row.id
+          this.upCheckPlan.f_safecheck_type=row.f_safecheck_type
           this.upCheckPlan.f_plan_name=row.f_plan_name
           this.upCheckPlan.f_plan_year=row.f_plan_year
           this.upCheckPlan.f_plan_month=row.f_plan_month
-          this.upCheckPlan.f_checker_id=row.f_checker_id
-          this.upCheckPlan.f_checker=row.f_checker
+          this.upCheckPlan.f_checker_id=row.f_checker_id?row.f_checker_id:null
+          this.upCheckPlan.f_checker=row.f_checker?row.f_checker:null
+          this.upCheckPlan.isShare=row.f_checker_id?'否':'是'
           this.upCheckPlan.f_issued=row.f_issued
           this.upCheckPlan.checker={id:row.f_checker_id,name:row.f_checker}
           this.showUpPlan=true
@@ -594,11 +664,21 @@
             Vue.showMessage("请选择安检月份！")
             return false
           }
+          console.log(this.upCheckPlan)
+
+          if(this.upCheckPlan.isShare=="是"){
+            this.upCheckPlan.f_checker_id=null
+            this.upCheckPlan.f_checker=null
+          }else{
+            this.upCheckPlan.f_checker_id=this.upCheckPlan.checker.id
+            this.upCheckPlan.f_checker=this.upCheckPlan.checker.name
+          }
           this.isSend=true
           let res=await new HttpResetClass().load("POST", "/rs/logic/updateCheckPlan", {
             data:{
-              f_checker:this.upCheckPlan.checker.name,
-              f_checker_id:this.upCheckPlan.checker.id,
+              f_checker:this.upCheckPlan.f_checker,
+              f_safecheck_type:this.upCheckPlan.f_safecheck_type,
+              f_checker_id:this.upCheckPlan.f_checker_id,
               f_plan_name:this.upCheckPlan.f_plan_name,
               f_plan_year:this.upCheckPlan.f_plan_year,
               f_plan_month:this.upCheckPlan.f_plan_month,

package/src/components/planmanage/checkPlanList.vue

@@ -34,9 +34,16 @@
               >
               </v-select>
             </div>-->
-            <div class="form-group col-sm-2" >
+            <div class="form-group col-sm-3" >
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUserCondition()">更多条件</button>
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
+<!--              <button class="button_search" style="margin-right: 10px"  @click="clear()">清除</button>-->
+              <export-excel-safe :data="$parent.$parent.exportParameter"
+                                 :field="$parent.$parent.exportExcelField"
+                                 style="margin-left: 0px"
+                                 sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                 :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'" :choose-col="true">
+              </export-excel-safe>
             </div>
             <div class="form-group col-sm-2 safe_p">
               <label class="font_normal_body" :title="$parent.$parent.selectplan.f_plan_name">{{$parent.$parent.selectplan.f_plan_name?'当前选中 : '+$parent.$parent.selectplan.f_plan_name:''}}</label>
@@ -115,15 +122,6 @@
                 <button class="button_search" @click="$parent.$parent.cancel">取消</button>
               </div>
             </modal>
-            <!--<div class="form-group col-sm-4 button-range" >
-              <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
-              <export-excel-safe   :data="$parent.$parent.exportParameter"
-                                   :field="$parent.$parent.excelHeaders"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
-                                   template-name='安检计划明细' :choose-col="true">
-              </export-excel-safe>
-
-            </div>-->
           </div>
         </div>
       </criteria>
@@ -134,6 +132,7 @@
             <th><nobr><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.checkAll" @change="$parent.$parent.$parent.setCheckAll()"/> 全选</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>
@@ -144,9 +143,10 @@
           <td style="text-align: center;white-space:nowrap;"><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.isChecked(row.f_check_item_id)"  @change="$parent.$parent.$parent.setCheckes(row.f_check_item_id)" /></td>
           <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_phone}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_user_type}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_residential_area}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_state}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_state==='已检'?row.f_last_check_state:'未检'}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
         </template>
       </data-grid>
@@ -170,166 +170,193 @@
 
 <script>
   import {HttpResetClass, PagedList} from "vue-client";
-    import Vue from "vue";
+  import Vue from "vue";
 
-    export default {
-        name: "PlanManage",
-        title: '计划管理',
-        data() {
-          return {
-            model:new PagedList('/rs/sql/planItem', 100, {}),
-            a:'1',
-            opt:[{label:"测试",value:"测试"}],
-            showCondtion:false,
-            checkAll:false,
-            checkes:[],
-            checkResults:[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}],
-            checkState:[{label:'未检',value:'未检'},{label:'已检',value:'已检'}],
-            showPlanModal:false
-          }
-        },
-        props:["selectplan","userlogin"],
-        ready(){
+  export default {
+    name: "PlanManage",
+    title: '计划管理',
+    data() {
+      return {
+        model:new PagedList('/rs/sql/planItem', 100, {}),
+        a:'1',
+        opt:[{label:"测试",value:"测试"}],
+        showCondtion:false,
+        checkAll:false,
+        checkes:[],
+        checkResults:[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}],
+        checkState:[{label:'全部',value:''},{label:'未检',value:'未检'},{label:'已检',value:'已检'}],
+        showPlanModal:false,
+        exportExcelField: {
+          'f_userinfo_code':'用户编号',
+          'f_user_name':'用户名称',
+          'f_user_type':'用户类型',
+          'f_residential_area':'小区名称',
+          'f_state':'安检状态',
+          'f_address':'地址',
+          'f_user_phone':'用户电话',
+          'f_newfile_date':'建档日期'
+        }
+      }
+    },
+    props:["selectplan","userlogin"],
+    ready(){
+
+    },
+    computed:{
+      exportParameter(){
+        // excel 导出条件拼接
+        return {
+          condition: this.$refs.paged.model.condition,
+          groupName: this.groupNameForSql
+        }
+      }
+    },
+    methods:{
+      clear(){
+        this.model.f_plan_id = '';
+        this.model.f_userinfo_code = '';
+        this.model.f_user_name = '';
+        this.model.f_address='';
 
-        },
-      methods:{
-        //将某个计划下的一项拖到另一个计划
-        async dragtoOtherPlanIteem() {
-          console.log(JSON.stringify(this.$refs.modalp.$children[0].selectedRow))
+      },
+      //将某个计划下的一项拖到另一个计划
+      async dragtoOtherPlanIteem() {
+        //tag)
 
-          if (!this.$refs.modalp.$children[0].selectedRow.id) {
-            this.$showMessage("请选择需要调整到那个计划中！")
-            return
+        if (!this.$refs.modalp.$children[0].selectedRow.id) {
+          this.$showMessage("请选择需要调整到那个计划中！")
+          return
+        }
+        this.$parent.isSend=true
+        try{
+          let res=await new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItem", {
+            data:{
+              f_operator:this.userlogin.name,
+              f_plan_id:this.$refs.modalp.$children[0].selectedRow.id,
+              condition:this.model.condition,
+              switchCheckAll:true,
+              checkAll:this.checkAll,
+              param:this.checkes,
+              columnName: "i.id"
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          this.$parent.isSend=false
+          if(res.data.code==200){
+            this.$showMessage("更换安检计划成功！")
+            this.$parent.refreshPlan()
+          }else{
+            this.$showMessage("更换安检计划失败！")
           }
-          this.$parent.isSend=true
-          try{
-            let res=await new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItem", {
-              data:{
+        }catch (e) {
+          this.$parent.isSend=false
+          this.$showMessage("更换安检计划失败！")
+        }
+      },
+      showplanModal(){
+        if(!this.selectplan || !this.selectplan.id){
+          this.$showMessage("请先打开一个计划再进行操作")
+          return
+        }
+        if(!this.checkAll && this.checkes.length==0){
+          this.$showMessage("请先在计划中勾选你要调整的用户！")
+          return
+        }
+        this.showPlanModal=true
+      },
+      showUserCondition(){
+        this.showCondtion=true
+      },
+      isChecked(v) {
+        // 如果全选，不在的按选中算，否则，在的按选中算
+        if (this.checkAll) {
+          return this.checkes.indexOf(v) == -1
+        } else {
+          return this.checkes.indexOf(v) != -1
+        }
+      },
+      setCheckAll() {
+        this.checkAll=this.checkAll?false:true;
+        // 全选改变后，清空选中数据
+        this.checkes = []
+      },
+      setCheckes(id) {
+        let index=this.checkes.indexOf(id)
+        if(index<0){
+          this.checkes.push(id)
+        }else{
+          this.checkes.splice(index,1)
+        }
+      },
+      cancel(){
+        this.showCondtion=false
+        this.showPlanModal=false
+      },
+      selfSearch (args) {
+        if(!this.selectplan.id){
+          this.$showMessage("请先选择一个计划！")
+          return
+        }
+        this.cancel()
+        this.checkes=[]
+        this.checkAll=false
+        args.condition+= ` and i.f_state!= '作废'`
+        this.model.search(args.condition, args.model, args.condValue)
+      },
+      checkStateChange(val){
+        if(val=='未检'){
+          this.checkResults=[]
+          this.$refs.paged.$refs.criteria.model.f_check_state=''
+        }else{
+          this.checkResults=[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}]
+        }
+      },
+      //修改计划项状态为作废
+      async delPlanItem() {
+        if(!this.selectplan || !this.selectplan.id){
+          this.$showMessage("请先打开一个计划再进行操作")
+          return
+        }
+        if(!this.checkAll && this.checkes.length==0){
+          this.$showMessage("请先在计划中勾选你要作废的用户！")
+          return
+        }
+        this.$showMessage("此操作无法撤回,确定要执行作废安检单操作吗？",['confirm','cancel']).then((button)=>{
+          if(button=='confirm'){
+            let resu=new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItemState", {
+              data: {
                 f_operator:this.userlogin.name,
-                f_plan_id:this.$refs.modalp.$children[0].selectedRow.id,
                 condition:this.model.condition,
                 switchCheckAll:true,
                 checkAll:this.checkAll,
                 param:this.checkes,
                 columnName: "i.id"
               }
-            }, {resolveMsg: null, rejectMsg: null})
-            this.$parent.isSend=false
-            if(res.data.code==200){
-              this.$showMessage("更换安检计划成功！")
-              this.$parent.refreshPlan()
-            }else{
-              this.$showMessage("更换安检计划失败！")
-            }
-          }catch (e) {
-            this.$parent.isSend=false
-            this.$showMessage("更换安检计划失败！")
-          }
-        },
-        showplanModal(){
-          if(!this.selectplan || !this.selectplan.id){
-            this.$showMessage("请先打开一个计划再进行操作")
-            return
-          }
-          if(!this.checkAll && this.checkes.length==0){
-            this.$showMessage("请先在计划中勾选你要调整的用户！")
-            return
-          }
-          this.showPlanModal=true
-        },
-        showUserCondition(){
-          this.showCondtion=true
-        },
-        isChecked(v) {
-          // 如果全选，不在的按选中算，否则，在的按选中算
-          if (this.checkAll) {
-            return this.checkes.indexOf(v) == -1
-          } else {
-            return this.checkes.indexOf(v) != -1
-          }
-        },
-        setCheckAll() {
-          this.checkAll=this.checkAll?false:true;
-          // 全选改变后，清空选中数据
-          this.checkes = []
-        },
-        setCheckes(id) {
-          let index=this.checkes.indexOf(id)
-          if(index<0){
-            this.checkes.push(id)
-          }else{
-            this.checkes.splice(index,1)
-          }
-        },
-        cancel(){
-          this.showCondtion=false
-          this.showPlanModal=false
-        },
-        selfSearch (args) {
-          if(!this.selectplan.id){
-            this.$showMessage("请先选择一个计划！")
-            return
-          }
-          this.cancel()
-          this.checkes=[]
-          this.checkAll=false
-          this.model.search(args.condition, args.model, args.condValue)
-        },
-        checkStateChange(val){
-          if(val=='已检'){
-            this.checkResults=[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}]
-          }else{
-            this.checkResults=[]
-            this.model.model.f_check_state=''
-          }
-        },
-        //修改计划项状态为作废
-        async delPlanItem() {
-            if(!this.selectplan || !this.selectplan.id){
-              this.$showMessage("请先打开一个计划再进行操作")
-              return
-            }
-            if(!this.checkAll && this.checkes.length==0){
-              this.$showMessage("请先在计划中勾选你要作废的用户！")
-              return
-            }
-          this.$showMessage("此操作无法撤回,确定要执行作废安检单操作吗？",['confirm','cancel']).then((button)=>{
-              if(button=='confirm'){
-                let resu=new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItemState", {
-                  data: {
-                    f_operator:this.userlogin.name,
-                    condition:this.model.condition,
-                    switchCheckAll:true,
-                    checkAll:this.checkAll,
-                    param:this.checkes,
-                    columnName: "i.id"
-                  }
-                }, {resolveMsg: null, rejectMsg: null}).then((resu)=>{
+            }, {resolveMsg: null, rejectMsg: null}).then((resu)=>{
 
-                  console.log("-----------"+JSON.stringify(resu.data))
-                  if(resu.data.code==200){
-                    this.$showMessage("移除安检单成功! 成功移除:"+resu.data.res.up+"条"+(resu.data.res.noup>0?"有"+resu.data.res.noup+"条已经不是 ‘未检’ 状态！":""))
-                    //this.checkes=[]
-                    //this.checkAll=false
-                    this.$parent.refresh()
-                  }else{
-                    this.$showMessage("取消安检计划失败!")
-                  }
-                })
+              //tag)
+              if(resu.data.code==200){
+                this.$showMessage("移除安检单成功! 成功移除:"+resu.data.res.up+"条"+(resu.data.res.noup>0?"有"+resu.data.res.noup+"条已经不是 ‘未检’ 状态！":""))
+                //this.checkes=[]
+                //this.checkAll=false
+                this.$parent.refresh()
+              }else{
+                this.$showMessage("取消安检计划失败!")
               }
             })
-        }
-      },
-      watch:{
-        'selectplan.id' (){
-          console.log("------------")
-          if(this.selectplan.id){
-            this.$refs.paged.$refs.criteria.model.f_plan_id=this.selectplan.id
-            this.$refs.paged.$refs.criteria.search()
           }
+        })
+      }
+    },
+    watch:{
+      'selectplan.id' (){
+        //tag
+        if(this.selectplan.id){
+          this.$refs.paged.$refs.criteria.model.f_plan_id=this.selectplan.id
+          this.$refs.paged.$refs.criteria.search()
         }
       }
     }
+  }
 </script>
 
 <style scoped>