system-clients 3.3.3-v3 → 3.3.3-v3-test1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.3.3-v3",
+  "version": "3.3.3-v3-test1",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/Main.vue

@@ -185,11 +185,7 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let param = {
-    tablename: 't_singlevalue',
-    condition: " 1=1 and name=\'水印内容\'"
-  };
-  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
@@ -397,10 +393,7 @@ let createWaterMark = function (userName) {
         this.OrderDaiBan  = ''
         this.AppDaiBan  = ''
         let http = new HttpResetClass()
-        await http.load('POST', '/rs/sql/singleTable', {data: {
-            tablename:'t_order_center',
-            condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
-          }}, {
+        await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {
@@ -445,10 +438,7 @@ let createWaterMark = function (userName) {
       async getExpireDate(){
         // 获取分公司的表品牌id
         let http = new HttpResetClass()
-        await http.load('POST', '/rs/sql/singleTable', {data: {
-            tablename:'t_gasbrand_orgid',
-            condition:`f_using_orgid ='${this.$login.f.orgid}'`
-          }}, {
+        await http.load('POST', '/rs/sql/safeGasbrandOrgidQueryByOrgId', {f_using_orgid: this.$login.f.orgid}, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {
@@ -459,10 +449,7 @@ let createWaterMark = function (userName) {
           }
           if (this.gasbrandIdData.length > 0) {
             // 获取卡表到期时间
-            http.load('POST', '/rs/sql/singleTable', {data: {
-                tablename:'t_gasbrand',
-                condition:`id in (${this.gasbrandIdData}) and f_meter_type like '%卡表%'`
-              }}, {
+            http.load('POST', '/rs/sql/safeGasbrandQueryByIds', {ids: this.gasbrandIdData.join(',')}, {
               resolveMsg: null,
               rejectMsg: null
             }).then((res) => {

package/src/components/equipment/PosList.vue

@@ -166,7 +166,7 @@
       return {
         source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
         model: new PagedList('rs/sql/equipmentQuery', 20),
-        model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
+        model2: new PagedList('rs/sql/safePoshistoryByTerminalNumber', 30),
         curorgid: [this.f_filialeid],
         f_orgid: '',
         f_filialeids: '',
@@ -248,8 +248,7 @@
       },
       abcd (row) {
         console.log("chakan",row)
-        let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
-        this.model2.search(condition)
+        this.model2.search({}, {f_terminal_number: row.f_terminal_number})
         this.infoshow = true
       },
       search () {

package/src/components/equipment/PosParamAdd.vue

@@ -139,11 +139,10 @@ export default {
     async edit(param_id) {
       this.param_id = param_id
       let load = new HttpResetClass()
-      load.load("POST", 'rs/sql/singleTable',
+      load.load("POST", 'rs/sql/safeEquipmentParamByParamId',
         {
           data: {
-            tablename: ' t_equipment_param ',
-            condition: ` f_param_id = ${param_id} `
+            f_param_id: param_id
           }
         },
         {resolveMsg: null, rejectMsg: null})

package/src/components/materialManage/materialList.vue

@@ -175,7 +175,7 @@
     data(){
           //配置后台systemModule，sql
        return{
-         model: new PagedList('rs/sql/singleTable_OrderBy', 50),
+         model: new PagedList('rs/sql/safeMaterialInfoSingleWithCondition', 50),
          row: null,
          searchshow: true,
          obj: {

package/src/components/parammanage/ParamPage.vue

@@ -267,7 +267,7 @@
         } else if (type === 't_paramvalue') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
+              this.$resetpost('rs/logic/safeParamvalueDelete', {id: row.id}).then((res) => {
                 this.getParamValue(this.selectItem)
               })
             }

package/src/components/parammanage/ParamPages.vue

@@ -113,7 +113,7 @@
     methods: {
       // 加载全部参数
       loadParams () {
-        this.$refs.paramsLoad.load('rs/sql/hql/simpleHql', {data: {tablename: 't_parameter'}}).then((res) => {
+        this.$refs.paramsLoad.load('rs/sql/safeParameterQuery').then((res) => {
           this.model.rows = this.allParams = res.data
         })
       },
@@ -159,7 +159,7 @@
         } else if (row.EntityType === 't_paramvalue') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$refs.selectsLoad.load('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
+              this.$refs.selectsLoad.load('rs/logic/safeParamvalueDelete', {id: row.id}).then((res) => {
                 this.params.rows.splice(index, 1)
               })
             }

package/src/components/parammanage/SinglePage.vue

@@ -183,7 +183,7 @@
       deleteItem (row) {
         this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$resetpost('rs/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
+            this.$resetpost('rs/logic/safeSinglevalueDelete', {id: row.id}).then((res) => {
               this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             })
           }

package/src/components/parammanage/SinglePages.vue

@@ -95,14 +95,14 @@
     },
     methods: {
       loadSingle () {
-        this.$refs.singleLoad.load('rs/sql/singleTable', {data: {tablename: 't_singlevalue', condition: '1=1'}}).then((res) => {
+        this.$refs.singleLoad.load('rs/sql/safeSinglevalueQuery', {data: {condition: '1=1'}}).then((res) => {
           this.model.rows = this.params = res.data
         })
       },
       deleteItem (row) {
         this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$refs.singleLoad.load('rs/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
+            this.$refs.singleLoad.load('rs/logic/safeSinglevalueDelete', {id: row.id}).then((res) => {
               this.loadSingle()
             })
           }

package/src/components/server/AddChangeMsg.vue

@@ -48,10 +48,11 @@ export default {
     },
     confirm () {
       let param = {
-        tablename: 't_changedeclare',
-        parameters: this.model
+        f_change_name: this.model.f_change_name,
+        f_change_message: this.model.f_change_message,
+        f_change_date: new Date().format('yyyy-MM-dd HH:mm:ss')
       }
-      this.$post('rs/logic/save', {data: param})
+      this.$post('rs/logic/safeChangedeclareSave', param)
       .then(() => {
         this.model = {}
         this.$emit('toggle')

package/src/components/server/ChangeDeclare.vue

@@ -22,15 +22,8 @@ export default {
     }
   },
   ready () {
-    let sql = 'singleTable_OrderBy'
-    let condition = {
-      items: 'id,f_change_name,f_change_message,f_change_date',
-      tablename: 't_changedeclare',
-      condition: ' 1=1',
-      orderitem: 'f_change_date DESC'
-    }
-    this.$info(`加载数据中..., sql:${sql}`)
-    this.$refs.pv.load('rs/sql/singleTable_OrderBy', {data: condition}).then((a) => {
+    this.$info(`加载数据中...`)
+    this.$refs.pv.load('rs/sql/safeChangedeclareQuery',{data:{condition:'f_change_message is not null'}}).then((a) => {
       this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
       this.model = a.data
     }).catch((error) => {

package/src/components/server/Login.vue

@@ -347,21 +347,20 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {f_orgid: this.$login.f.orgid}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } else {
-        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
-      }
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
+      })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -369,7 +368,6 @@ export default {
       if (res.data.length> 0){
         this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
       }
-    })
       let data = {
         condition: '1 = 1',
         data: {
@@ -391,7 +389,6 @@ export default {
         this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
       }
     })
-
     },
     async getDaiBanA(){
       // 是否全局开启待办通知

package/src/components/server/PcdBuildingSelect.vue

@@ -66,41 +66,20 @@
     self.arrays.pcd=[{label:'全部',value:''}]
     if(self.show.pcdShow){
       let HttpReset = new HttpResetClass()
-      var pcd = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
-        data: {
-          items: 'f_pcd',
-          tablename: 't_pcd',
-          condition: `f_pcd is not null group by f_pcd`,
-          orderitem: 'f_pcd'
-        }
-      }, {resolveMsg: null, rejectMsg: '获取省市区出错!'})
+      var pcd = await HttpReset.load('POST', 'rs/sql/safePcdQuery', {}, {resolveMsg: null, rejectMsg: '获取省市区出错!'})
       for(var i=0;i<pcd.data.length;i++){
         self.arrays.pcd.push({label:pcd.data[i].f_pcd,value:pcd.data[i].f_pcd})
       }
     }else if(self.show.streetShow){
       console.log("------------查街道")
       let HttpReset = new HttpResetClass()
-      var street = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
-        data: {
-          items: 'f_street',
-          tablename: 't_street',
-          condition: `f_filialeid = '${self.$login.f.orgid}' and f_street is not null group by f_street`,
-          orderitem: 'f_street'
-        }
-      }, {resolveMsg: null, rejectMsg: '获取街道出错!'})
+      var street = await HttpReset.load('POST', 'rs/sql/safeStreetQueryByFiliale', {f_filialeid: self.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取街道出错!'})
       for(var i=0;i<street.data.length;i++){
         self.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
       }
     }else if(self.show.areaShow){
       let HttpReset = new HttpResetClass()
-      var area = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
-        data: {
-          items: 'f_residential_area',
-          tablename: 't_area',
-          condition: `f_filialeid = '${self.$login.f.orgid}' and f_residential_area is not null group by f_residential_area`,
-          orderitem: 'f_residential_area'
-        }
-      }, {resolveMsg: null, rejectMsg: '获取小区出错!'})
+      var area = await HttpReset.load('POST', 'rs/sql/safeAreaQueryByFiliale', {f_filialeid: self.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取小区出错!'})
       for(var i=0;i<area.data.length;i++){
         self.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
       }
@@ -154,15 +133,7 @@
     methods:{
       async pcdChange(){
         this.arrays.street=[{label:'全部',value:''}]
-        var condition = `f_filialeid = '${this.$login.f.orgid}' and f_street is not null group by f_street`
-        let street = await this.$resetpost('rs/sql/singleTable_OrderBy', {
-          data: {
-            items: 'f_street',
-            tablename: 't_street',
-            condition: condition,
-            orderitem: 'f_street'
-          }
-        }, {resolveMsg: null, rejectMsg: '获取街道出错'})
+        let street = await this.$resetpost('rs/sql/safeStreetQueryByFiliale', {f_filialeid: this.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取街道出错'})
         for(var i=0;i<street.data.length;i++){
           this.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
         }
@@ -170,15 +141,7 @@
       },
       async streetChange(){
         this.arrays.area=[{label:'全部',value:''}]
-        var condition = `f_street = '${this.model.f_street?this.model.f_street:null}' and f_residential_area is not null group by f_residential_area`
-        let area = await this.$resetpost('rs/sql/singleTable_OrderBy', {
-          data: {
-            items: 'f_residential_area',
-            tablename: 't_area',
-            condition: condition,
-            orderitem: 'f_residential_area'
-          }
-        }, {resolveMsg: null, rejectMsg: '获取小区出错'})
+        let area = await this.$resetpost('rs/sql/safeAreaQueryByStreet', {f_street: this.model.f_street}, {resolveMsg: null, rejectMsg: '获取小区出错'})
         for(var i=0;i<area.data.length;i++){
           this.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
         }
@@ -186,20 +149,12 @@
       },
       async areaChange(){
         this.building = [{label:'全部',value:''}]
-        var condition=''
+        let build
         if(this.show.areaShow){
-          condition = `f_residential_area = '${this.model.f_residential_area?this.model.f_residential_area:null}' and f_building is not null group by f_building`
+          build = await this.$resetpost('rs/sql/safeBuildingQueryByArea', {f_residential_area: this.model.f_residential_area}, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
         }else{
-          condition = `f_filialeid = '${this.$login.f.orgid}' and f_building is not null group by f_building`
+          build = await this.$resetpost('rs/sql/safeBuildingQueryByFiliale', {f_filialeid: this.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
         }
-        let build = await this.$resetpost('rs/sql/singleTable_OrderBy', {
-          data: {
-            items: 'f_building',
-            tablename: 't_user_address',
-            condition: condition,
-            orderitem: 'f_building'
-          }
-        }, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
         for(var i=0;i<build.data.length;i++){
           this.arrays.building.push({label:build.data[i].f_building,value:build.data[i].f_building})
         }

package/src/filiale/baole/Login.vue

@@ -361,21 +361,20 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } else {
-        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
-      }
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
+      })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -383,7 +382,6 @@ export default {
       if (res.data.length> 0){
         this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
       }
-    })
       let data = {
         condition: '1 = 1',
         data: {
@@ -405,7 +403,6 @@ export default {
         this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
       }
     })
-
     },
     async getDaiBanA(){
       // 是否全局开启待办通知

package/src/filiale/chengtou/Login.vue

@@ -359,21 +359,20 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } else {
-        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
-      }
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
+      })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -381,7 +380,6 @@ export default {
       if (res.data.length> 0){
         this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
       }
-    })
       let data = {
         condition: '1 = 1',
         data: {
@@ -403,7 +401,6 @@ export default {
         this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
       }
     })
-
     },
     async getDaiBanA(){
       // 是否全局开启待办通知

package/src/filiale/dongguan/Login.vue

@@ -350,21 +350,20 @@ export default {
   methods: {
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } else {
-        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
-      }
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
+      })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -372,7 +371,6 @@ export default {
       if (res.data.length> 0){
         this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
       }
-    })
       let data = {
         condition: '1 = 1',
         data: {
@@ -394,7 +392,6 @@ export default {
         this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
       }
     })
-
     },
     async getDaiBanA(){
       // 是否全局开启待办通知

package/src/filiale/dongguan/Main.vue

@@ -93,11 +93,7 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let param = {
-    tablename: 't_singlevalue',
-    condition: " 1=1 and name=\'水印内容\'"
-  };
-  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(result.data[0].value);
@@ -241,10 +237,7 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
-        }}, {
+      await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {

package/src/filiale/furuike/Login.vue

@@ -273,8 +273,7 @@ export default {
         // this.$showMessage("re----" + JSON.stringify(re))
         if (re.data.code === 200) {
           this.showlogin = false
-          let condition = `ename = '${re.data.data.userName}'`
-          this.$resetpost('rs/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.$resetpost('rs/sql/safeUserQueryByEname', {ename: re.data.data.userName}, {resolveMsg: null, rejectMsg: null}).then((res) => {
             if (res.data && res.data.length > 0) {
               this.model.ename = res.data[0].ename
               this.model.password = res.data[0].password
@@ -396,29 +395,27 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } else {
-        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
-      }
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
-          OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
-          OrderDaiBan[item.f_ordertype].push(item)
-        })
-        this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
-        if (res.data.length> 0){
-          this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
-        }
       })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
+        OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
+        OrderDaiBan[item.f_ordertype].push(item)
+      })
+      this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+      if (res.data.length> 0){
+        this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
+      }
       let data = {
         condition: '1 = 1',
         data: {
@@ -440,7 +437,6 @@ export default {
           this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
         }
       })
-
     },
     async getDaiBanA(){
       // 是否全局开启待办通知

package/src/filiale/furuike/Main.vue

@@ -174,11 +174,7 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let param = {
-    tablename: 't_singlevalue',
-    condition: " 1=1 and name=\'水印内容\'"
-  };
-  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
@@ -327,10 +323,7 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
-        }}, {
+      await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {
@@ -400,12 +393,8 @@ export default {
     },
     async workorderOverRemind(){
       if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('管理员') !== -1 && this.functions.f_role_name.indexOf('管理人员') == -1){
-        let res = await new HttpResetClass().load('POST', '/rs/sql/tel_singleTable', {
-          "data": {
-            "items": "*",
-            "tablename": "t_organization",
-            "condition": `parentid = '${this.functions.orgid}'`
-          }
+        let res = await new HttpResetClass().load('POST', '/rs/sql/safeOrganizationQueryByParentId', {
+          parentid: this.functions.orgid
         }, {resolveMsg: null, rejectMsg: null})
         const f_filialeids = [this.functions.orgid]
         for (const f of res.data) {
@@ -413,7 +402,8 @@ export default {
         }
 
         const data = {
-          condition: `f_filiale_id in (${f_filialeids.join(',')}) and overday >= 0`
+          f_filiale_ids: f_filialeids.join(','),
+          overday: 0
         }
         new HttpResetClass().load('POST','rs/sql/serviceDetails/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
           if(res.data && res.data.n !== 0){