apply-clients 3.2.30-2 → 3.2.30-3

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/product/applyMaterial/PickingAddingMaterial.vue +22 -1
  3. package/src/components/product/applyMaterial/PickingMaterialList.vue +200 -143
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.2.30-2",
3
+ "version": "3.2.30-3",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/product/applyMaterial/PickingAddingMaterial.vue CHANGED
@@ -14,6 +14,8 @@
14
14
  <th style="white-space: nowrap;">材料型号</th>
15
15
  <th style="white-space: nowrap;">材料规格</th>
16
16
  <th style="white-space: nowrap;">单位</th>
17
+ <th style="white-space: nowrap;">数量</th>
18
+ <th style="white-space: nowrap;">消耗日期</th>
17
19
  <th style="white-space: nowrap;">备注</th>
18
20
  <th style="white-space: nowrap;">
19
21
  <button @click="$parent.$parent.openModal()" type="button" class="btn btn-info">
@@ -32,6 +34,8 @@
32
34
  <td style="text-align: center;">{{row.f_qhmaterial_model}}</td>
33
35
  <td style="text-align: center;">{{row.f_qhmaterial_norm}}</td>
34
36
  <td style="text-align: center;">{{row.f_qhunit}}</td>
37
+ <td style="text-align: center;">{{row.f_quantity}}</td>
38
+ <td style="text-align: center;">{{row.f_consume_date}}</td>
35
39
  <td style="text-align: center;">{{row.f_qhremarks}}</td>
36
40
  <td style="text-align: center;">
37
41
  <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.openUpdateFacility($index,row)">修改</button>
@@ -83,6 +87,21 @@
83
87
  <input class="form-control" type="text" v-validate:f_unit = "['required']" v-model="facility.f_qhunit" :value="facility.f_qhunit"/>
84
88
  </div>
85
89
  </div>
90
+
91
+ <div class="col-sm-12 form-group" :class="[$mv.f_quantity.required ? 'has-error' : '']">
92
+ <label class="control-label col-sm-2">数量</label>
93
+ <div class="col-sm-9">
94
+ <input class="form-control" type="text" v-validate:f_quantity = "['required']" v-model="facility.f_quantity" :value="facility.f_quantity"/>
95
+ </div>
96
+ </div>
97
+
98
+ <div class="col-sm-12 form-group" :class="[$mv.f_consume_date.required ? 'has-error' : '']">
99
+ <label class="control-label col-sm-2">消耗日期</label>
100
+ <div class="col-sm-9">
101
+ <input class="form-control" type="date" v-validate:f_consume_date = "['required']" v-model="facility.f_consume_date" :value="facility.f_consume_date" placeholder="例：2022.06.17"/>
102
+ </div>
103
+ </div>
104
+
86
105
  <div class="col-sm-12 form-group" :class="[$mv.f_qhremarks.required ? 'has-error' : '']">
87
106
  <label class="control-label col-sm-2">备注</label>
88
107
  <div class="col-sm-9">
@@ -177,7 +196,9 @@
177
196
  item.f_qhmaterial_name === this.facility.f_qhmaterial_name &&
178
197
  item.f_qhmaterial_norm === this.facility.f_qhmaterial_norm &&
179
198
  item.f_qhmaterial_model === this.facility.f_qhmaterial_model &&
180
- item.f_qhunit === this.facility.f_qhunit
199
+ item.f_qhunit === this.facility.f_qhunit &&
200
+ item.f_quantity === this.facility.f_quantity &&
201
+ item.f_consume_date === this.facility.f_consume_date
181
202
  ) {
182
203
  return true
183
204
  }
package/src/components/product/applyMaterial/PickingMaterialList.vue CHANGED
@@ -1,143 +1,200 @@
1
- <template>
2
- <criteria-paged :model="model" v-ref:cp>
3
- <criteria partial='criteria' @condition-changed='search' v-ref:cri>
4
- <div class="form-horizontal select-overspread container-fluid auto" partial>
5
- <div class="row">
6
- <div class="form-group col-sm-3">
7
- <label class="font_normal_body">材料名称：</label>
8
- <input type="text" style="width: 60%" class="input_search" placeholder='材料名称' v-model="model.f_qhmaterial_name"
9
- v-on:keyup.enter="$parent.$parent.search()"
10
- condition="f_qhmaterial_name like '%{}%'">
11
- </div>
12
- <div class="form-group col-sm-3">
13
- <label class="font_normal_body">材料编码：</label>
14
- <input type="text" style="width: 60%" class="input_search" placeholder='材料名称' v-model="model.f_qhmaterial_coding"
15
- v-on:keyup.enter="$parent.$parent.search()"
16
- condition="f_qhmaterial_coding like '%{}%'">
17
- </div>
18
- <div class="form-group col-sm-3">
19
- <label class="font_normal_body">材料型号：</label>
20
- <input type="text" style="width: 60%" class="input_search" placeholder='材料型号' v-model="model.f_qhmaterial_model"
21
- v-on:keyup.enter="$parent.$parent.search()"
22
- condition="f_qhmaterial_model like '%{}%'">
23
- </div>
24
- <div class="form-group col-sm-3">
25
- <label class="font_normal_body">材料规格：</label>
26
- <input type="text" style="width: 60%" class="input_search" placeholder='材料规格' v-model="model.f_qhmaterial_norm"
27
- v-on:keyup.enter="$parent.$parent.search()"
28
- condition="f_qhmaterial_norm like '%{}%'">
29
- </div>
30
- <div class="form-group col-sm-3">
31
- <label class="font_normal_body">单&emsp;&emsp;位：</label>
32
- <input type="text" class="input_search" style="width: 60%" placeholder='单位' v-model="model.f_qhunit"
33
- v-on:keyup.enter="$parent.$parent.search()"
34
- condition="f_qhunit like '%{}%'">
35
- </div>
36
- <div class="form-group col-sm-3 button-range">
37
- <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
38
- <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
39
- <button class="button_new button_spacing" @click="$parent.$parent.openAddFacility()">添加材料</button>
40
- </div>
41
- </div>
42
- </div>
43
- </criteria>
44
- <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
45
- <template partial='head'>
46
- <tr>
47
- <th style="white-space: nowrap;">序号</th>
48
- <th style="white-space: nowrap;">材料编码</th>
49
- <th style="white-space: nowrap;">材料名称</th>
50
- <th style="white-space: nowrap;">材料型号</th>
51
- <th style="white-space: nowrap;">材料规格</th>
52
- <th style="white-space: nowrap;">单位</th>
53
- <th style="white-space: nowrap;">备注</th>
54
- </tr>
55
- </template>
56
- <template partial='body'>
57
- <tr >
58
- <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
59
- <nobr><font>{{$index+1}}</font></nobr>
60
- </td>
61
- <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
62
- <nobr><font>{{row.f_qhmaterial_coding}}</font></nobr>
63
- </td>
64
- <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
65
- <nobr><font>{{row.f_qhmaterial_name}}</font></nobr>
66
- </td>
67
- <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
68
- <nobr><font>{{row.f_qhmaterial_model}}</font></nobr>
69
- </td>
70
- <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
71
- <nobr><font>{{row.f_qhmaterial_norm}}</font></nobr>
72
- </td>
73
- <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
74
- <nobr><font>{{row.f_qhunit}}</font></nobr>
75
- </td>
76
- <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
77
- <nobr><font>{{row.f_qhremarks}}</font></nobr>
78
- </td>
79
- </tr>
80
- </template>
81
- </data-grid>
82
- </criteria-paged>
83
- </template>
84
-
85
- <script>
86
- import {PagedList} from 'vue-client'
87
- import {HttpResetClass} from 'vue-client'
88
- // Date格式化
89
- Date.prototype.Format = function (fmt) {
90
- var o = {
91
- 'M+': this.getMonth() + 1, // 月份
92
- 'd+': this.getDate(), // 日
93
- 'H+': this.getHours(), // 小时
94
- 'm+': this.getMinutes(), // 分
95
- 's+': this.getSeconds(), // 秒
96
- 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
97
- 'S': this.getMilliseconds() // 毫秒
98
- }
99
- if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
100
- for (var k in o) {
101
- if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
102
- }
103
- return fmt
104
- }
105
- export default {
106
- title: '材料列表',
107
- props: ['showData'],
108
- data () {
109
- return {
110
- model: new PagedList('rs/sql/getQhMaterial', 30, {
111
- data: {
112
- orgid: this.$login.f.orgid
113
- }
114
- }),
115
- criteriaShow: false
116
- }
117
- },
118
- ready () {
119
- // 调用查询
120
- this.search()
121
- },
122
- methods: {
123
- // 打开添加设备
124
- openAddFacility () {
125
- this.$dispatch('openAddFacility')
126
- },
127
- clear () {
128
- Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
129
- this.$refs.cp.$refs.cri.model[key] = null
130
- })
131
- },
132
- // 查询
133
- search () {
134
- this.$dispatch('search')
135
- }
136
- },
137
- computed: {
138
- }
139
- }
140
- </script>
141
-
142
- <style scoped>
143
- </style>
1
+ <template>
2
+ <criteria-paged :model="model" v-ref:cp>
3
+ <criteria partial='criteria' @condition-changed='search' v-ref:cri>
4
+ <div class="form-horizontal select-overspread container-fluid auto" partial>
5
+ <div class="row">
6
+ <div class="form-group col-sm-3">
7
+ <label class="font_normal_body">材料名称：</label>
8
+ <input type="text" style="width: 60%" class="input_search" placeholder='材料名称' v-model="model.f_qhmaterial_name"
9
+ v-on:keyup.enter="$parent.$parent.search()"
10
+ condition="f_qhmaterial_name like '%{}%'">
11
+ </div>
12
+ <div class="form-group col-sm-3">
13
+ <label class="font_normal_body">材料编码：</label>
14
+ <input type="text" style="width: 60%" class="input_search" placeholder='材料名称' v-model="model.f_qhmaterial_coding"
15
+ v-on:keyup.enter="$parent.$parent.search()"
16
+ condition="f_qhmaterial_coding like '%{}%'">
17
+ </div>
18
+ <div class="form-group col-sm-3">
19
+ <label class="font_normal_body">材料型号：</label>
20
+ <input type="text" style="width: 60%" class="input_search" placeholder='材料型号' v-model="model.f_qhmaterial_model"
21
+ v-on:keyup.enter="$parent.$parent.search()"
22
+ condition="f_qhmaterial_model like '%{}%'">
23
+ </div>
24
+ <div class="form-group col-sm-3">
25
+ <label class="font_normal_body">材料规格：</label>
26
+ <input type="text" style="width: 60%" class="input_search" placeholder='材料规格' v-model="model.f_qhmaterial_norm"
27
+ v-on:keyup.enter="$parent.$parent.search()"
28
+ condition="f_qhmaterial_norm like '%{}%'">
29
+ </div>
30
+ <div class="form-group col-sm-3">
31
+ <label class="font_normal_body">单&emsp;&emsp;位：</label>
32
+ <input type="text" class="input_search" style="width: 60%" placeholder='单位' v-model="model.f_qhunit"
33
+ v-on:keyup.enter="$parent.$parent.search()"
34
+ condition="f_qhunit like '%{}%'">
35
+ </div>
36
+ <div class="form-group col-sm-3">
37
+ <label for="startDate" class="font_normal_body">消耗开始时间：</label>
38
+ <datepicker id="startDate2" placeholder="开始日期"
39
+ style="width: 60%!important;"
40
+ v-model="model.startDate2"
41
+ :value.sync="model.startDate2"
42
+ :format="'yyyy-MM-dd'"
43
+ :show-reset-button="true"
44
+ condition="f_consume_date >= '{}'">
45
+ </datepicker>
46
+ </div>
47
+ <div class="form-group col-sm-3">
48
+ <label for="endDate" class="font_normal_body">消耗结束时间：</label>
49
+ <datepicker id="endDate2" placeholder="结束日期"
50
+ style="width: 60%!important;"
51
+ v-model="model.endDate2"
52
+ :value.sync="model.endDate2"
53
+ :format="'yyyy-MM-dd'"
54
+ :show-reset-button="true"
55
+ condition="f_consume_date <= '{}'">
56
+ </datepicker>
57
+ </div>
58
+ <div class="form-group col-sm-3">
59
+ <label for="startDate" class="font_normal_body">录入开始时间：</label>
60
+ <datepicker id="startDate" placeholder="开始日期"
61
+ style="width: 60%!important;"
62
+ v-model="model.startDate"
63
+ :value.sync="model.startDate"
64
+ :format="'yyyy-MM-dd HH:mm:ss'"
65
+ :show-reset-button="true"
66
+ condition="f_operation_date >= '{}'">
67
+ </datepicker>
68
+ </div>
69
+ <div class="form-group col-sm-3">
70
+ <label for="endDate" class="font_normal_body">录入结束时间：</label>
71
+ <datepicker id="endDate" placeholder="结束日期"
72
+ style="width: 60%!important;"
73
+ v-model="model.endDate"
74
+ :value.sync="model.endDate"
75
+ :format="'yyyy-MM-dd HH:mm:ss'"
76
+ :show-reset-button="true"
77
+ condition="f_operation_date <= '{}'">
78
+ </datepicker>
79
+ </div>
80
+ <div class="form-group col-sm-3 button-range">
81
+ <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
82
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
83
+ <button class="button_new button_spacing" @click="$parent.$parent.openAddFacility()">添加材料</button>
84
+ </div>
85
+ </div>
86
+ </div>
87
+ </criteria>
88
+ <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
89
+ <template partial='head'>
90
+ <tr>
91
+ <th style="white-space: nowrap;">序号</th>
92
+ <th style="white-space: nowrap;">材料编码</th>
93
+ <th style="white-space: nowrap;">材料名称</th>
94
+ <th style="white-space: nowrap;">材料型号</th>
95
+ <th style="white-space: nowrap;">材料规格</th>
96
+ <th style="white-space: nowrap;">单位</th>
97
+ <th style="white-space: nowrap;">数量</th>
98
+ <th style="white-space: nowrap;">消耗日期</th>
99
+ <th style="white-space: nowrap;">录入日期</th>
100
+ <th style="white-space: nowrap;">备注</th>
101
+ </tr>
102
+ </template>
103
+ <template partial='body'>
104
+ <tr >
105
+ <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
106
+ <nobr><font>{{$index+1}}</font></nobr>
107
+ </td>
108
+ <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
109
+ <nobr><font>{{row.f_qhmaterial_coding}}</font></nobr>
110
+ </td>
111
+ <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
112
+ <nobr><font>{{row.f_qhmaterial_name}}</font></nobr>
113
+ </td>
114
+ <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
115
+ <nobr><font>{{row.f_qhmaterial_model}}</font></nobr>
116
+ </td>
117
+ <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
118
+ <nobr><font>{{row.f_qhmaterial_norm}}</font></nobr>
119
+ </td>
120
+ <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
121
+ <nobr><font>{{row.f_qhunit}}</font></nobr>
122
+ </td>
123
+ <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
124
+ <nobr><font>{{row.f_quantity}}</font></nobr>
125
+ </td>
126
+ <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
127
+ <nobr><font>{{row.f_consume_date}}</font></nobr>
128
+ </td>
129
+ <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
130
+ <nobr><font>{{row.f_operation_date}}</font></nobr>
131
+ </td>
132
+
133
+ <td style="text-align: center;" @click="$parent.$parent.$parent.openViewFacility(row)">
134
+ <nobr><font>{{row.f_qhremarks}}</font></nobr>
135
+ </td>
136
+ </tr>
137
+ </template>
138
+ </data-grid>
139
+ </criteria-paged>
140
+ </template>
141
+
142
+ <script>
143
+ import {PagedList} from 'vue-client'
144
+ import {HttpResetClass} from 'vue-client'
145
+ // Date格式化
146
+ Date.prototype.Format = function (fmt) {
147
+ var o = {
148
+ 'M+': this.getMonth() + 1, // 月份
149
+ 'd+': this.getDate(), // 日
150
+ 'H+': this.getHours(), // 小时
151
+ 'm+': this.getMinutes(), // 分
152
+ 's+': this.getSeconds(), // 秒
153
+ 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
154
+ 'S': this.getMilliseconds() // 毫秒
155
+ }
156
+ if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
157
+ for (var k in o) {
158
+ if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
159
+ }
160
+ return fmt
161
+ }
162
+ export default {
163
+ title: '材料列表',
164
+ props: ['showData'],
165
+ data () {
166
+ return {
167
+ model: new PagedList('rs/sql/getQhMaterial', 30, {
168
+ data: {
169
+ orgid: this.$login.f.orgid
170
+ }
171
+ }),
172
+ criteriaShow: false
173
+ }
174
+ },
175
+ ready () {
176
+ // 调用查询
177
+ this.search()
178
+ },
179
+ methods: {
180
+ // 打开添加设备
181
+ openAddFacility () {
182
+ this.$dispatch('openAddFacility')
183
+ },
184
+ clear () {
185
+ Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
186
+ this.$refs.cp.$refs.cri.model[key] = null
187
+ })
188
+ },
189
+ // 查询
190
+ search () {
191
+ this.$dispatch('search')
192
+ }
193
+ },
194
+ computed: {
195
+ }
196
+ }
197
+ </script>
198
+
199
+ <style scoped>
200
+ </style>