safecheck-client 3.0.33-gongyi → 3.0.34-1

package/src/components/planmanage/PlanManage.vue

@@ -16,13 +16,13 @@
                       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)">
             <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",
@@ -346,13 +399,16 @@
             a:'1',
             opt:[{label:"按时间降序",value:"按时间降序"},{label:"按时间升序",value:"按时间升序"}],
             currentorder:'按时间降序',
+            isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
             checkplan : new SearchList(true),
             selectPlan:{id:''},
             upCheckPlan:{
               f_plan_name:'',
+              f_safecheck_type:'',
               f_plan_year:'',
               f_plan_month:'',
               f_checker_id:'',
+              isShare:'',
               f_checker:'',
               checker:{}
             },
@@ -374,8 +430,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:[],
@@ -396,8 +452,25 @@
         },
       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() {
+         /*/!* 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 +546,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 +583,17 @@
         //查询安检员selectChanged
         async searchChecker(id){
           let res=await new HttpResetClass().load('POST', '/rs/search', {
-            source: 'tool.getChildrenOfResName($安检员$)',
-            userid: 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})
-          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 +624,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 +646,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 +674,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,
@@ -647,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,