manage-client 4.1.135-tc → 4.1.136

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,7 +6,7 @@ const proxyMiddleware = require('http-proxy-middleware')
6
6
  const app = express()
7
7
  const compiler = webpack(config)
8
8
 
9
- const server = 'http://172.168.1.11:8400/'
9
+ const server = 'http://192.168.50.67:31567/'
10
10
  const local = 'http://127.0.0.1:9026/'
11
11
  const proxyTable = {
12
12
  '/rs/logic/exportfile': {
@@ -16,22 +16,22 @@ const proxyTable = {
16
16
  target: server
17
17
  },
18
18
  '/api/af-revenue/sql/': {
19
- // pathRewrite: {
20
- // '^/api/af-revenue': '/'
21
- // },
22
- target: server
19
+ pathRewrite: {
20
+ '^/api/af-revenue': '/'
21
+ },
22
+ target: local
23
23
  },
24
24
  '/api/af-revenue/report/': {
25
- // pathRewrite: {
26
- // '^/api/af-revenue': '/'
27
- // },
28
- target: server
25
+ pathRewrite: {
26
+ '^/api/af-revenue': '/'
27
+ },
28
+ target: local
29
29
  },
30
30
  '/api/af-revenue/logic': {
31
- // pathRewrite: {
32
- // '^/api/af-revenue': '/'
33
- // },
34
- target: server
31
+ pathRewrite: {
32
+ '^/api/af-revenue': '/'
33
+ },
34
+ target: local
35
35
  },
36
36
  '/api': {
37
37
  target: server
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.1.135-tc",
3
+ "version": "4.1.136",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -101,14 +101,14 @@
101
101
  <th>表名</th>
102
102
  <th>保存人</th>
103
103
  <th>保存时间</th>
104
- <!-- <th>操作</th>-->
104
+ <th>操作</th>
105
105
  </tr>
106
106
  </template>
107
107
  <template partial='body' >
108
108
  <td>{{row.f_files_name}}</td>
109
109
  <td>{{row.f_operator}}</td>
110
110
  <td>{{row.f_operate_date}}</td>
111
- <!-- <td><button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.delete(row)">删除</button></td>-->
111
+ <td><button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.delete(row)">删除</button></td>
112
112
  </template>
113
113
  </data-grid>
114
114
  </criteria-paged>
@@ -177,6 +177,12 @@ export default {
177
177
  this.reportHistory = true
178
178
  this.model.search('1=1')
179
179
  },
180
+ delete (row) {
181
+ this.$resetdelete('rs/entity/t_report_record', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
182
+ this.$dispatch('delect-report', '删除计划', row)
183
+ this.search()
184
+ })
185
+ },
180
186
  getReportInfo (tname, cond) {
181
187
  this.$resetpost('api/af-revenue/sql/manageSingleTable',{data: {
182
188
  tablename: tname ? tname : this.tablename,
@@ -681,7 +681,7 @@
681
681
  // },
682
682
  getCondition() {
683
683
  return {
684
- condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
684
+ condition: `${this.$refs.paged.$refs.cri.condition.replace(/f_zones/, "f_slice_area")}` + this.orgCondtionStr,
685
685
  orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
686
686
  },
687
687
  getfield() {