sale-client 3.5.59 → 3.5.60
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.
- package/build/dev-server.js +10 -3
- package/package.json +1 -1
- package/src/components/FilesManage/UserGeneralInfoTest.vue +12 -1
- package/src/components/MaterialsManage/MaterialsBase.vue +23 -8
- package/src/components/MaterialsManage/MaterialsList.vue +3 -3
- package/src/components/MaterialsManage/MaterialsManage.vue +3 -3
package/build/dev-server.js
CHANGED
|
@@ -10,9 +10,8 @@ var compiler = webpack(config)
|
|
|
10
10
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
|
-
var bendi = 'http://
|
|
14
|
-
|
|
15
|
-
var fuwu = 'http://192.168.50.4:8400'
|
|
13
|
+
var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://127.0.0.1:8080/'// 公司测试服务
|
|
14
|
+
var fuwu = 'http://121.36.106.17:8400'
|
|
16
15
|
// var fuwu = 'http://121.36.106.17:8400/'
|
|
17
16
|
// 铜川正式
|
|
18
17
|
// var fuwu = 'http://61.134.55.234:9999/'
|
|
@@ -54,6 +53,14 @@ var proxyTable = {
|
|
|
54
53
|
'/rs/logic/getInitData': {
|
|
55
54
|
target: fuwu
|
|
56
55
|
},
|
|
56
|
+
// 查找资源服务数据
|
|
57
|
+
'/rs/entity/t_material_info': {
|
|
58
|
+
target: bendi1
|
|
59
|
+
},
|
|
60
|
+
// 查找资源服务数据
|
|
61
|
+
'/rs/logic/query_material': {
|
|
62
|
+
target: bendi1
|
|
63
|
+
},
|
|
57
64
|
'/rs/logic/getSaleInitData': {
|
|
58
65
|
target: fuwu
|
|
59
66
|
},
|
package/package.json
CHANGED
|
@@ -153,7 +153,7 @@ export default {
|
|
|
153
153
|
base: {
|
|
154
154
|
f_user_name: '',
|
|
155
155
|
f_user_state: '',
|
|
156
|
-
f_user_type:'',
|
|
156
|
+
f_user_type: '',
|
|
157
157
|
f_credentials: '',
|
|
158
158
|
f_cost_type: '',
|
|
159
159
|
f_bz_type: '',
|
|
@@ -337,6 +337,17 @@ export default {
|
|
|
337
337
|
if (this.fileSaveData.reason && this.fileSaveData.reason !== '其他') {
|
|
338
338
|
this.fileSaveData.modifyReason = this.fileSaveData.reason
|
|
339
339
|
}
|
|
340
|
+
console.log('row-------->',this.row)
|
|
341
|
+
for (let item in this.filechangeDetails.rows){
|
|
342
|
+
if (item.f_field_name === '通气日期') {
|
|
343
|
+
let name = this.$login.f.name
|
|
344
|
+
let parentname = this.$login.f.f_parentname
|
|
345
|
+
console.log('验证进来了--------------->',name,parentname)
|
|
346
|
+
this.fileSaveData.userinfo.f_operator = name
|
|
347
|
+
this.fileSaveData.userinfo.f_depname = parentname
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
|
|
340
351
|
this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
|
|
341
352
|
this.$parent.resdata = res.data.result[0].f_userinfo_code
|
|
342
353
|
if (!this.row) {
|
|
@@ -10,14 +10,16 @@
|
|
|
10
10
|
<input type="text"
|
|
11
11
|
:disabled="look"
|
|
12
12
|
v-model="model.name" style="width:60%"
|
|
13
|
-
class="input_search full-with" placeholder="
|
|
13
|
+
class="input_search full-with" placeholder="名称">
|
|
14
14
|
</div>
|
|
15
15
|
<div class="col-sm-6">
|
|
16
16
|
<label class="font_normal_body">类别</label>
|
|
17
|
-
<
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
<v-select :disabled="look"
|
|
18
|
+
v-model="model.type"
|
|
19
|
+
placeholder='项目类别'
|
|
20
|
+
:value.sync="model.type"
|
|
21
|
+
:value-single="true"
|
|
22
|
+
:options='types'></v-select>
|
|
21
23
|
</div>
|
|
22
24
|
</div>
|
|
23
25
|
<div class="row" style="margin-top:1rem;" v-if="model.type ==='型号'">
|
|
@@ -35,6 +37,13 @@
|
|
|
35
37
|
v-model="model.code" style="width:60%"
|
|
36
38
|
class="input_search full-with" id="name" placeholder="物料编码">
|
|
37
39
|
</div>
|
|
40
|
+
<div class="col-sm-6">
|
|
41
|
+
<label class="font_normal_body">单价</label>
|
|
42
|
+
<input type="text"
|
|
43
|
+
:disabled="look"
|
|
44
|
+
v-model="model.price" style="width:60%"
|
|
45
|
+
class="input_search full-with" id="name" placeholder="物料单价">
|
|
46
|
+
</div>
|
|
38
47
|
</div>
|
|
39
48
|
<!-- 按钮 -->
|
|
40
49
|
<div class="row col-sm-12" style="margin-top: 1rem">
|
|
@@ -46,6 +55,8 @@
|
|
|
46
55
|
<span class=" glyphicon glyphicon-log-out"></span>返回
|
|
47
56
|
</button>
|
|
48
57
|
</div>
|
|
58
|
+
<div class="row col-sm-12" style="margin-top: 18rem">
|
|
59
|
+
</div>
|
|
49
60
|
<work-busy :is-busy="isbusy"></work-busy>
|
|
50
61
|
</div>
|
|
51
62
|
</template>
|
|
@@ -68,7 +79,11 @@ export default {
|
|
|
68
79
|
},
|
|
69
80
|
type: '',
|
|
70
81
|
isbusy: false,
|
|
71
|
-
types:
|
|
82
|
+
types: this.$appdata.getParam('材料管理-项目类别') ? this.$appdata.getParam('材料管理-项目类别') : [{
|
|
83
|
+
label: '型号',
|
|
84
|
+
value: '型号'
|
|
85
|
+
}, {label: '燃气具设备', value: '燃气具设备'}, {label: '报建', value: '报建'},
|
|
86
|
+
{label: '规格', value: '规格'}, {label: '材料', value: '材料'}, {label: '品名', value: '品名'}],
|
|
72
87
|
showFile: 'false',
|
|
73
88
|
file: []
|
|
74
89
|
}
|
|
@@ -118,7 +133,7 @@ export default {
|
|
|
118
133
|
this.$dispatch('cancel')
|
|
119
134
|
},
|
|
120
135
|
async confirm () {
|
|
121
|
-
await this.$resetpost('
|
|
136
|
+
await this.$resetpost('rs/entity/t_material_info', this.model).then(res =>
|
|
122
137
|
this.$parent.$refs.funlist.searchData()
|
|
123
138
|
)
|
|
124
139
|
},
|
|
@@ -127,7 +142,7 @@ export default {
|
|
|
127
142
|
},
|
|
128
143
|
delFile (row) {
|
|
129
144
|
if (!this.look) {
|
|
130
|
-
this.$resetdelete(`
|
|
145
|
+
this.$resetdelete(`rs/entity/t_material_info`, {id: row.id}).then(res =>
|
|
131
146
|
this.initdata()
|
|
132
147
|
)
|
|
133
148
|
}
|
|
@@ -122,7 +122,7 @@ export default {
|
|
|
122
122
|
condition: condition || '1 = 1'
|
|
123
123
|
}
|
|
124
124
|
this.seaching = true
|
|
125
|
-
let temp = await this.$resetpost('
|
|
125
|
+
let temp = await this.$resetpost('rs/logic/query_material', {data}, {rejectMsg: null, resolveMsg: null})
|
|
126
126
|
if (!model) {
|
|
127
127
|
this.model = handleTree(temp.data)
|
|
128
128
|
}
|
|
@@ -149,7 +149,7 @@ export default {
|
|
|
149
149
|
this.$showAlert('请先删除子目录！', 'warning', 2000)
|
|
150
150
|
return
|
|
151
151
|
}
|
|
152
|
-
this.$resetdelete(`
|
|
152
|
+
this.$resetdelete(`rs/entity/t_material_info`, {id: obj.data.id}).then(res =>
|
|
153
153
|
this.searchData()
|
|
154
154
|
)
|
|
155
155
|
},
|
|
@@ -162,7 +162,7 @@ export default {
|
|
|
162
162
|
depict: '',
|
|
163
163
|
type: '普通模式'
|
|
164
164
|
}
|
|
165
|
-
await this.$resetpost('
|
|
165
|
+
await this.$resetpost('rs/entity/t_material_info', model).then(res =>
|
|
166
166
|
this.searchData()
|
|
167
167
|
)
|
|
168
168
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="unit" class="flex-row">
|
|
3
3
|
<material-display @select-changed='selected' @modify-res="modifyRes"
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
@add-res="addRes"
|
|
5
|
+
class="basic-main" style="width:auto;" v-ref:funlist>
|
|
6
6
|
</material-display>
|
|
7
7
|
<div class="binary-right" style="width: 40%;overflow-x: hidden; overflow-y: scroll;" v-if="row">
|
|
8
8
|
<materials-base :look='look' :data="row" :title="title"
|
|
9
|
-
|
|
9
|
+
:parent="row.parent_name" @cancel="cancel">
|
|
10
10
|
</materials-base>
|
|
11
11
|
</div>
|
|
12
12
|
</div>
|