system-clients 3.2.2 → 3.2.3-aodeToV4

package/src/components/equipment/EquipmentManage.vue

@@ -19,8 +19,8 @@
     <div v-if="model.f_equipment_type[0] === 'PC'">
       <pc-manage></pc-manage>
     </div>
-    <div v-if="model.f_equipment_type[0] === 'POS'">
-      <pos-manage></pos-manage>
+    <div v-if="model.f_equipment_type[0] === 'POS'||model.f_equipment_type[0] === '自助写卡机'||model.f_equipment_type[0] === '手持POS'">
+      <pos-manage :type="model.f_equipment_type[0]"></pos-manage>
     </div>
     <div v-if="model.f_equipment_type[0] === 'PHONE'">
       <phone-manage></phone-manage>
@@ -46,7 +46,7 @@
     },
     ready () {
       console.log('看看终端类型',  this.equipmentType)
-      this.model.f_equipment_type = [this.equipmentType[0].value]
+      this.model.f_equipment_type = ['POS']
     },
     methods: {
       del (row) {

package/src/components/equipment/PcAdd.vue

@@ -74,7 +74,7 @@
         this.model.f_operatorid = this.$login.f.id
         this.model.f_orgid = this.f_orgid
         console.log('保存', this.model)
-        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+        this.$resetpost('api/af-system/entity/save/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {
           this.$dispatch('refresh')

package/src/components/equipment/PcList.vue

@@ -76,9 +76,10 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('rs/sql/equipmentQuery', 20),
+        model: new PagedList('api/af-system/sql/equipmentQuery', 20),
         curorgid: [this.$login.f.orgid],
-        f_orgid: ''
+        f_filialeid: this.$login.f.orgid,
+        f_orgid: this.$login.f.orgid
       }
     },
     ready () {
@@ -102,7 +103,7 @@
       del (row) {
         console.log('要删除了', row)
         row.f_state = '已删除'
-        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$resetpost('api/af-system/entity/save/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {
           this.$dispatch('refresh')

package/src/components/equipment/PhoneAdd.vue

@@ -65,7 +65,7 @@
         this.model.f_operator = this.$login.f.name
         this.model.f_filialeids = this.filialeCodeStr
         console.log('保存', this.model)
-        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+        this.$resetpost('api/af-system/entity/save/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch(() => {
           this.$dispatch('refresh')

package/src/components/equipment/PhoneList.vue

@@ -58,7 +58,7 @@
     components: {},
     data () {
       return {
-        model: new PagedList('rs/sql/equipmentQuery', 20),
+        model: new PagedList('api/af-system/sql/equipmentQuery', 20),
         filialeNameStr: this.$login.f.f_fengongsi,
         filialeCodeStr: this.$login.f.f_orgids,
         userid:this.$login.f.id,
@@ -84,7 +84,7 @@
       del (row) {
         console.log('要删除了', row)
         row.f_state = '已删除'
-        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$resetpost('api/af-system/entity/save/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {
           this.$dispatch('refresh')

package/src/components/equipment/PosAdd.vue

@@ -2,9 +2,19 @@
   <div class="auto select-overspread">
     <validator name='v'>
       <ul class="nav nav-tabs" >
-        <li role="presentation" class="active"><a href="#">POS</a></li>
+        <li role="presentation" class="active"><a href="#">{{ type }}</a></li>
       </ul>
       <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-6">
+            <label class="font_normal_body">使用公司</label>
+            <res-select restype='organization'
+                        is-mul="false"
+                        @res-select="getorg"
+                        :initresid="curorgid">
+            </res-select>
+          </div>
+        </div>
         <div class="row">
           <div class="col-sm-6">
             <label class="font_normal_body" >设备编号</label>
@@ -35,6 +45,7 @@
             <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行" >
           </div>
         </div>
+
         <div  class="col-sm-12">
           <label  class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
           <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
@@ -53,11 +64,14 @@
   export default {
     data () {
       return {
+        f_orgid:'',
+        f_filialeid:'',
+        curorgid: [this.f_filialeids],
         model: {
           f_terminal_number: '',
           f_terminal_name: '',
           f_bank_name: '',
-          f_equipment_type: 'POS',
+          f_equipment_type: '',
           f_state: '正常',
           f_machine_number:'',
           f_phone:'',
@@ -68,7 +82,7 @@
         }
       }
     },
-    props: ['data', 'f_filialeids'],
+    props: ['data', 'f_filialeids','type'],
     watch: {
       'data' (val) {
         if (val) {
@@ -85,16 +99,21 @@
       }
     },
     methods: {
+      getorg (val) {
+        this.f_orgid = val[0]
+        this.f_filialeids = val[0]
+      },
       confirm () {
        // if(this.f_filialeids!=''&&this.f_filialeids!=null){
          this.model.f_operator = this.$login.f.name
+         this.model.f_equipment_type = this.type
          this.model.f_operatorid = this.$login.f.id
          this.model.f_filialeids = this.f_filialeids
-         this.model.f_orgid = this.$login.f.orgid
+         this.model.f_orgid = this.f_filialeids
          this.model.f_orgname = this.$login.f.orgs
          this.model.f_depid = this.$login.f.depids
          this.model.f_depname = this.$login.f.deps
-         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+         this.$resetpost('api/af-system/entity/save/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
            this.$dispatch('refresh')
          }).catch((error) => {
            this.$dispatch('refresh')

package/src/components/equipment/PosList.vue

@@ -65,10 +65,10 @@
             <th>联系电话</th>
             <th>所在地</th>
             <th>所属银行</th>
-            <th>电池电量</th>
-            <th>是否登录</th>
-            <th>更新时间</th>
-            <th>软件版本</th>
+<!--            <th>电池电量</th>-->
+<!--            <th>是否登录</th>-->
+<!--            <th>更新时间</th>-->
+<!--            <th>软件版本</th>-->
             <th>操作</th>
           </tr>
         </template>
@@ -81,10 +81,10 @@
             <td style="text-align:center">{{row.f_phone}}</td>
             <td style="text-align:center">{{row.f_address}}</td>
             <td style="text-align:center">{{row.f_bank_name}}</td>
-            <td style="text-align:center">{{row.f_battery_level}}</td>
-            <td style="text-align:center">{{row.f_is_login}}</td>
-            <td style="text-align:center">{{row.f_hybrid_version}}</td>
-            <td style="text-align:center">{{row.f_appVer}}</td>
+<!--            <td style="text-align:center">{{row.f_battery_level}}</td>-->
+<!--            <td style="text-align:center">{{row.f_is_login}}</td>-->
+<!--            <td style="text-align:center">{{row.f_hybrid_version}}</td>-->
+<!--            <td style="text-align:center">{{row.f_appVer}}</td>-->
             <td style="text-align:center">
               <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
@@ -104,14 +104,14 @@
     components: {},
     data () {
       return {
-        model: new PagedList('rs/sql/equipmentQuery', 20),
-        curorgid: [this.f_filialeid],
-        f_orgid: '',
-        f_filialeids:'',
+        model: new PagedList('api/af-system/sql/equipmentQuery', 20),
+        curorgid: [this.$login.f.orgid],
+        f_filialeid: this.$login.f.orgid,
+        f_orgid: this.$login.f.orgid,
         criteriaShow: false
       }
     },
-    props: ['f_filialeid'],
+    props: ['f_filialeid','type'],
     ready () {
       this.search()
     },
@@ -123,7 +123,7 @@
       },
 
       selfSearch (args) {
-        args.condition =  `${args.condition} and f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
+        args.condition =  `${args.condition} and f_equipment_type = '${this.type}' and f_state = '正常' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
         this.model.search(args.condition, this.model)
         this.$dispatch('research')
       },
@@ -141,7 +141,7 @@
       del (row) {
         console.log('要删除了', row)
         row.f_state = '已删除'
-        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$resetpost('api/af-system/entity/save/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {
           this.$dispatch('refresh')

package/src/components/equipment/PosManage.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="flex-row">
     <div :class="{'basic-main':!isChange,'binary-left':isChange}">
-      <pos-list :row="row" @select-changed="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" v-ref:list ></pos-list>
+      <pos-list :type="type" :row="row" @select-changed="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" v-ref:list ></pos-list>
     </div>
     <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
-      <pos-add :data="row" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
+      <pos-add  :type="type" :data="row" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
     </div>
   </div>
 </template>
@@ -15,6 +15,7 @@
 
   export default {
     title: 'POS终端管理',
+    props:['type'],
     components: {
       PosList, PosAdd
     },

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('api/af-revenue/sql/singleTable_OrderBy', 50),
          row: null,
          searchshow: true,
          obj: {

package/src/components/parammanage/ParamPage.vue

@@ -175,7 +175,7 @@
       async queryParam (condition) {
         this.model.rows = []
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'api/af-system/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.model.rows = res.data
       },
       selected (val) {
@@ -184,7 +184,7 @@
       },
       async getParamValue(obj) {
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'api/af-system/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.params.rows  = res.data
       },
       filter_query (paramName,orgid) {
@@ -235,7 +235,7 @@
         if (type === 't_parameter') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('rs/logic/deleteParam', row).then((res) => {
+              this.$resetpost('api/af-system/logic/deleteParam', row).then((res) => {
                 this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
                 this.selectItem = null
               })
@@ -244,7 +244,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('api/af-system/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
                 this.getParamValue(this.selectItem)
               })
             }
@@ -268,7 +268,7 @@
             //添加当前分公司
           }
           data.f_filialeids = this.modifyItem.f_filialeids
-          this.$resetpost('rs/logic/system_saveParam', data).then((res) => {
+          this.$resetpost('api/af-system/logic/system_saveParam', data).then((res) => {
             //无id
             this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             this.show = false
@@ -287,7 +287,7 @@
               processid: this.selectItem.id
             }
           }
-          this.$resetpost('rs/entity/t_paramvalue', data).then((res) => {
+          this.$resetpost('api/af-system/entity/save/t_paramvalue', data).then((res) => {
             this.show = false
             // 如果没有id，需要在数组中添加
             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('api/af-system/sql/hql/simpleHql', {data: {tablename: 't_parameter'}}).then((res) => {
           this.model.rows = this.allParams = res.data
         })
       },
@@ -150,7 +150,7 @@
         if (row.EntityType === 't_parameter') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$refs.paramsLoad.load('rs/logic/deleteParam', row).then((res) => {
+              this.$refs.paramsLoad.load('api/af-revenue/logic/deleteParam', row).then((res) => {
                 this.loadParams()
                 this.selectItem = null
               })
@@ -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('api/af-revenue/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
                 this.params.rows.splice(index, 1)
               })
             }
@@ -181,7 +181,7 @@
               name: this.modifyItem.name
             }
           }
-          this.$refs.paramsLoad.load('rs/entity/t_parameter', data).then((res) => {
+          this.$refs.paramsLoad.load('api/af-system/entity/save/t_parameter', data).then((res) => {
             this.loadParams()
             this.show = false
             this.modifyItem = {name: ''}
@@ -199,7 +199,7 @@
               processid: this.selectItem.id
             }
           }
-          this.$refs.selectsLoad.load('rs/entity/t_paramvalue', data).then((res) => {
+          this.$refs.selectsLoad.load('api/af-system/entity/save/t_paramvalue', data).then((res) => {
             this.show = false
             // 如果没有id，需要在数组中添加
             if (!data.id) {

package/src/components/parammanage/SinglePage.vue

@@ -149,7 +149,7 @@
       async queryParam (condition) {
         this.model.rows = []
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'api/af-system/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.model.rows = res.data
       },
 
@@ -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('api/af-system/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
               this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             })
           }
@@ -201,7 +201,7 @@
         this.show = true
       },
       confirm () {
-        this.$resetpost('rs/logic/system_saveSingle', this.selectItem).then((res) => {
+        this.$resetpost('api/af-system/logic/system_saveSingle', this.selectItem).then((res) => {
           // 如果没有id，需要在数组中添加
           this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
           this.show = false

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('api/af-system/sql/singleTable', {data: {tablename: 't_singlevalue', 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('api/af-revenue/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
               this.loadSingle()
             })
           }
@@ -132,7 +132,7 @@
         this.selectItem.value = row.value
       },
       confirm () {
-        this.$refs.singleLoad.load('rs/entity/t_singlevalue', this.selectItem).then((res) => {
+        this.$refs.singleLoad.load('api/af-system/entity/save/t_singlevalue', this.selectItem).then((res) => {
           this.show = false
           // 如果没有id，需要在数组中添加
           this.loadSingle()

package/src/components/server/AddChangeMsg.vue

@@ -51,7 +51,7 @@ export default {
         tablename: 't_changedeclare',
         parameters: this.model
       }
-      this.$post('rs/logic/save', {data: param})
+      this.$post('api/af-revenue/logic/save', {data: param})
       .then(() => {
         this.model = {}
         this.$emit('toggle')

package/src/components/server/ChangeDeclare.vue

@@ -30,7 +30,7 @@ export default {
       orderitem: 'f_change_date DESC'
     }
     this.$info(`加载数据中..., sql:${sql}`)
-    this.$refs.pv.load('rs/sql/singleTable_OrderBy', {data: condition}).then((a) => {
+    this.$refs.pv.load('api/af-revenue//sql/singleTable_OrderBy', {data: condition}).then((a) => {
       this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
       this.model = a.data
     }).catch((error) => {