system-clients 3.3.3-old → 3.3.3-v3-test

package/src/components/Util.js

@@ -77,6 +77,21 @@ export function parse3339String (strDate) {
   )
 }
 
+// 判断密码最后修改时间是否超过两个半月（2个月零15天）
+export function isPasswordModificationExpired (lastModificationTime) {
+  if (!lastModificationTime) {
+    return true
+  }
+  const lastMod = parse3339String(lastModificationTime)
+  if (isNaN(lastMod.getTime())) {
+    return true
+  }
+  const expireDate = new Date(lastMod)
+  expireDate.setMonth(expireDate.getMonth() + 2)
+  expireDate.setDate(expireDate.getDate() + 15)
+  return new Date() > expireDate
+}
+
 export function format3339TimeString (dt) {
   let month = dt.getMonth() + 1
   let date = dt.getDate()

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) => {