safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/paper/PaperVerify.vue

@@ -170,7 +170,7 @@
     export default {
         title: '安检单审核',
         data() {
-            let model = new PagedList('rs/sql/查找安检单', 20, {
+            let model = new PagedList('api/af-safecheck/sql/QueryCheckPaper', 20, {
                 f_plan_id: 'this.f_check_plan.id',
                 f_approved: 'this.f_approved[0]',
                 f_entry_status: 'this.f_entry[0]',

package/src/components/paper/PlanChooser.vue

@@ -58,21 +58,23 @@
   let select = function * (self) {
     let http = new HttpResetClass()
     http.load('POST', '/rs/search', {
-        source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+        source: 'tool.getChildrenOfResName($安检员$)',
         userid: self.$login.f.id
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
       console.log('获取安检员', res)
+      self.checkers.push({label:'全部',value:''})
       res.data.forEach((checker)=>{
-        self.checkers.push({label:checker.name,value:checker.id})
+        if (self.$login.f.orgid == checker.orgid){
+          self.checkers.push({label:checker.name,value:checker.id})
+        }
       })
-      self.checkers.push({label:'全部',value:''})
     })
   }
 
 
   export default {
     title: '选择安检计划',
-    props: ['f'],
+    props: ['f','safetype'],
     data() {
       let options = []
       let year = (new Date()).getFullYear()
@@ -81,8 +83,8 @@
       let moptions = []
       for(let i=1; i<=12; i++)
         moptions.push({label: i + '', value: i + ''})
-      let model = new PagedList('rs/sql/按年月人员提取安检计划', 20,
-        {f_checker_id: 'this.f_checker_id', f_plan_year: 'this.f_plan_year', f_plan_month: 'this.f_plan_month'})
+      let model = new PagedList('api/af-safecheck/sql/按年月人员提取安检计划', 20,
+        {f_checker_id: 'this.f_checker_id', f_plan_year: 'this.f_plan_year', f_plan_month: 'this.f_plan_month',safecheckType:'this.safecheckType',f_filialeid:`${this.$login.f.orgid}`})
       model.f_checker_id = ''
       return {
         checker:'',
@@ -99,7 +101,11 @@
       this.model.f_plan_year = this.c_plan_year[0]
       this.model.f_plan_month = this.c_plan_month[0]
       this.model.f_subcompany = Vue.f_subcompany
-
+      if(this.safetype){
+        this.model.safecheckType=this.safetype
+      }else{
+        this.model.safecheckType=""
+      }
       let gen = select(this)
       return co(gen)
     },

package/src/components/paper/RepairVerify.vue

@@ -85,7 +85,7 @@ export default {
   title: '维修审核',
   props: ['f'],
   data() {
-    let model = new PagedList('rs/sql/查找维修单', 20, {
+    let model = new PagedList('api/af-safecheck/sql/查找维修单', 20, {
       f_plan_id: 'this.f_check_plan.id',
       f_repair_approved: 'this.f_approved[0]',
       f_no_checkplan: 'this.f_no_checkplan[0]',

package/src/components/paper/RepairVerifyForm.vue

@@ -47,7 +47,7 @@ import co from 'co'
 import Vue from 'vue'
 
 let syncVerify = function * (self) {
-  yield self.$resetpost('rs/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'})
+  yield self.$resetpost('api/af-safecheck/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'})
 }
 
 export default {

package/src/components/paper/VerifyForm.vue

@@ -47,7 +47,7 @@
   import Vue from 'vue'
 
   let syncApprove = function * (self) {
-    yield self.$resetpost('rs/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then(
+    yield self.$resetpost('api/af-safecheck/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then(
       (res)=>{
       if(res.data.code == 200){
       alert("安检单审核通过!")
@@ -58,7 +58,7 @@
   }
 
   let syncDisapprove = function * (self) {
-    yield self.$resetpost('rs/logic/DisapprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then((res)=> {
+    yield self.$resetpost('api/af-safecheck/logic/DisapprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then((res)=> {
       if (res.data.code == 200) {
       alert("安检单已打回!")
       self.$back('items')
@@ -67,7 +67,7 @@
   }
 
   let noPlanDisapprove = function * (self) {
-    yield self.$resetpost('rs/logic/NoPlanDisapprove', {data: self.item}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then((res)=> {
+    yield self.$resetpost('api/af-safecheck/logic/NoPlanDisapprove', {data: self.item}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then((res)=> {
       if (res.data.code == 200) {
       alert("安检单已打回!")
       self.$back('items')

package/src/components/pc/AnnouncementPC.vue

@@ -7,7 +7,7 @@
             <div class="row">
               <div class="form-group col-sm-2" style="margin-bottom: 0px">
                 <label class="font_normal_body">公&emsp;&emsp;司</label>
-                <right-tree :width="'60%'" @re-res="getRes"></right-tree>
+                <right-tree :width="'60%'" @re-res="$parent.$parent.getRes"></right-tree>
               </div>
               <div class="form-group col-sm-2"  >
                 <label class="font_normal_body">标&emsp;&emsp;题</label>
@@ -121,6 +121,16 @@
                 <input type="text" class="input_search" style="width: 70%;" v-model="f_title" />
               </div>
             </div>
+            <div class="row" style="margin-top: 10px">
+              <label class="control-label font text-left" style="float:left;margin-left:20%;margin-top:5px">公&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;司</label>
+              <div class="col-xs-8 col-md-8">
+                <res-select
+                  :initresid='curorgid'
+                  @res-select="getorg"
+                  restype='organization'
+                ></res-select>
+              </div>
+            </div>
             <div class="row" style="margin-top: 10px">
               <label  class="control-label font text-left" style="float:left;margin-left:20%;margin-top:5px">内&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;容</label>
               <div class="col-xs-8 col-md-8">
@@ -178,20 +188,16 @@
 
 <script>
   import {PagedList} from 'vue-client'
-  import Vue from 'vue'
   import co from 'co'
-  import AppData from '../../stores/AppData'
-  import * as Util from '../Util'
-  import getNowDate from "../../utils/getNowDate";
   import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
-  import BenzAMRRecorder from 'benz-amr-recorder'
+
 
 
 
   export default {
     title: '安检结果查看',
     data() {
-      let model = new PagedList('rs/sql/FetchAnnouncement', 20, {
+      let model = new PagedList('api/af-safecheck/sql/FetchAnnouncement', 20, {
         f_filialeids:"this.f_filialeid",
         orderitem: "'id desc'"
       })
@@ -199,7 +205,7 @@
       model.f_approved = ''
       model.f_entry = ''
       model.f_no_checkplan = ''
-      model.f_filialeid = `('305')`
+      model.f_filialeid = `('${this.$login.f.orgid}')`
       //model.f_check_type='民用'
       // let searchData={
       //     f_plan_id: this.model.f_checker_id==undefined?"":this.model.f_checker_id,
@@ -214,6 +220,7 @@
       return {
         f_title:'',
         f_content:'',
+        curorgid: [this.$login.f.orgid],
         modalTitle:'',
         rowId:'',
         selectRow:{},
@@ -240,8 +247,9 @@
           'f_offsite_time': '安检时间',
           'f_checker_name': '安检员'
         },
+
         fun: this.$login.f,
-        checkersid: [],
+        checkersid: [],f_sendorgid:'',
         criteriaShow: false,
         showModal: false,
         showModal2:false,
@@ -257,10 +265,26 @@
       }
     },
     methods: {
-      getRes(obj) {
-        this.model.f_filialeids = this.$login.convertToIn(obj.resids);
-        console.log(this.model.f_filialeids)
+      getorg (val) {
+        console.log(val)
+        let orgid=''
+        for (let i = 0; i < val.length; i++) {
+          if (i==0){
+            orgid+=val[i]
+          }else{
+            orgid+=","+val[i]
+          }
+        }
+        this.f_sendorgid = orgid
+        console.log("8888888888888")
+        console.log(this.f_sendorgid)
       },
+       /*getRes(obj) {
+         console.log(obj)
+         console.log(JSON.stringify(obj))
+         this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+         console.log(this.model.f_filialeids)
+       },*/
       showaudio(){
         console.log("999999999")
         this.audioshow=!this.audioshow
@@ -296,7 +320,7 @@
         //console.log(val)
         this.sliceArea=[]
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
               items: 'name',
               tablename: 't_zone',
               condition: `parentid  in ${val}`,
@@ -321,7 +345,7 @@
         //console.log(val)
         this.cbcs=[]
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
               items: 'f_book_name,f_book_slice_area,id',
               tablename: 't_meter_book',
               condition: `f_filiale_id  in ${val}`,
@@ -351,8 +375,8 @@
       getRes(obj) {
         this.model.f_filialeid = this.$login.convertToIn(obj.resids);
         this.searchData.f_filialeid = this.$login.convertToIn(obj.resids);
-        this.Mreadibook(this.model.f_filialeid)
-        this.getAllMeterBook(this.model.f_filialeid)
+        //this.Mreadibook(this.model.f_filialeid)
+        //this.getAllMeterBook(this.model.f_filialeid)
         //this.$refs.paged.$refs.criteria.search()
       },
 
@@ -363,7 +387,7 @@
               operator:"delete",
               id:row.id
             }
-            new HttpResetClass().load('POST','/rs/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
+            new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
               this.$showMessage(res.data.msg)
               this.$refs.paged.$refs.criteria.search()
             })
@@ -407,15 +431,20 @@
             this.$showMessage("请输入公告内容！")
             return
           }
+          if(!this.f_sendorgid){
+            this.$showMessage("请选择下发公司！")
+            return
+          }
           let param={
             operator:"insert",
             f_title:this.f_title,
             f_content:this.f_content,
-            f_send_people:'hwq',
-            f_orgid:'305',
-            f_orgname:'荣成港华燃气公司'
+            f_sendorgid:this.f_sendorgid,
+            f_send_people:this.$login.f.name,
+            f_orgid:this.$login.f.orgid,
+            f_orgname:this.$login.f.orgname
           }
-          new HttpResetClass().load('POST','/rs/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
+          new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
             this.$showMessage(res.data.msg)
             this.f_title = ''
             this.f_content = ''
@@ -437,7 +466,7 @@
             f_content:this.f_content,
             id:this.rowId
           }
-          new HttpResetClass().load('POST','/rs/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
+          new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
             this.$showMessage(res.data.msg)
             this.f_title = ''
             this.f_content = ''