sale-client 4.3.90 → 4.3.92
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/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/.project +0 -6
- package/build/dev-server.js +1 -1
- package/package.json +1 -1
- package/src/filiale/yangchun/CardList.vue +1 -2
- package/src/filiale/yangchun/OtherChargeNew.vue +3 -2
- package/src/main.js +2 -2
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/.project
CHANGED
|
@@ -5,11 +5,6 @@
|
|
|
5
5
|
<projects>
|
|
6
6
|
</projects>
|
|
7
7
|
<buildSpec>
|
|
8
|
-
<buildCommand>
|
|
9
|
-
<name>org.eclipse.jdt.core.javabuilder</name>
|
|
10
|
-
<arguments>
|
|
11
|
-
</arguments>
|
|
12
|
-
</buildCommand>
|
|
13
8
|
<buildCommand>
|
|
14
9
|
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
|
|
15
10
|
<arguments>
|
|
@@ -17,7 +12,6 @@
|
|
|
17
12
|
</buildCommand>
|
|
18
13
|
</buildSpec>
|
|
19
14
|
<natures>
|
|
20
|
-
<nature>org.eclipse.jdt.core.javanature</nature>
|
|
21
15
|
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
|
|
22
16
|
</natures>
|
|
23
17
|
<filteredResources>
|
package/build/dev-server.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
2
|
var checkVersion = require('./versionCheck.js')
|
|
3
3
|
checkVersion()
|
|
4
|
-
const [ serverRul, localUrl ] = ['http://
|
|
4
|
+
const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
package/package.json
CHANGED
|
@@ -368,9 +368,8 @@
|
|
|
368
368
|
}
|
|
369
369
|
}
|
|
370
370
|
if (this.authArr.includes('冲正权限')) {
|
|
371
|
-
|
|
372
371
|
const canCancelOther = this.config.cancleother || this.authArr.includes('撤销他人记录') || this.$login.f.rolesnames.includes('财务退款')
|
|
373
|
-
if (
|
|
372
|
+
if (canCancelOther && row.f_operator !== this.$login.f.name) {
|
|
374
373
|
this.$showAlert('不能撤销不是自己进行的操作', 'warning', 1500)
|
|
375
374
|
return
|
|
376
375
|
}
|
|
@@ -50,6 +50,7 @@
|
|
|
50
50
|
<div class="col-sm-4" :class="{'has-success':row.f_unitprice,'has-error':!row.f_unitprice}">
|
|
51
51
|
<label style="" for="f_unitprice" class=" font_normal_body">*单 价</label>
|
|
52
52
|
<input class="input_search" style=" width:60%" type="number" min="1" @input.prevent="getcollection()"
|
|
53
|
+
v-validate:f_unitprice='{required: true, dctest: [0, ">" ] }'
|
|
53
54
|
v-model="row.f_unitprice"
|
|
54
55
|
:value.sync="row.f_unitprice"
|
|
55
56
|
:disabled="false"
|
|
@@ -506,7 +507,7 @@ export default {
|
|
|
506
507
|
this.model.otherdetail[index].f_typenumber = ''
|
|
507
508
|
this.model.otherdetail[index].typeNameList = this.$appdata.getParam(val.f_brand_spec[0])
|
|
508
509
|
this.model.otherdetail[index].typenumberList = []
|
|
509
|
-
this.model.otherdetail[index].f_unitprice =
|
|
510
|
+
this.model.otherdetail[index].f_unitprice = 0
|
|
510
511
|
let self = this
|
|
511
512
|
if (val == '开卡费') {
|
|
512
513
|
if (this.$appdata.getSingleValue('开卡费')) {
|
|
@@ -525,7 +526,7 @@ export default {
|
|
|
525
526
|
},
|
|
526
527
|
setTypenumber (val, index) {
|
|
527
528
|
this.model.otherdetail[index].typenumberList = this.$appdata.getParam(val.f_typename[0 ])
|
|
528
|
-
this.model.otherdetail[index].f_unitprice =
|
|
529
|
+
this.model.otherdetail[index].f_unitprice = 0
|
|
529
530
|
},
|
|
530
531
|
async confirm (parameter) {
|
|
531
532
|
let res = await this.$showMessage(`确定对客户${this.row.f_user_name}进行其他收费吗?`, ['confirm', 'cancel'])
|
package/src/main.js
CHANGED
|
@@ -2,7 +2,7 @@ import Vue from 'vue'
|
|
|
2
2
|
import all from 'vue-client/src/all'
|
|
3
3
|
import App from './App'
|
|
4
4
|
import system from 'system-clients/src/system'
|
|
5
|
-
import FilialeSale from './filiale/
|
|
5
|
+
// import FilialeSale from './filiale/yangchun/sale'
|
|
6
6
|
import sale from './sale'
|
|
7
7
|
import address from 'address-client/src/address'
|
|
8
8
|
import ldap from 'ldap-clients/src/ldap'
|
|
@@ -24,7 +24,7 @@ system(false)
|
|
|
24
24
|
sale()
|
|
25
25
|
address()
|
|
26
26
|
ldap()
|
|
27
|
-
FilialeSale()
|
|
27
|
+
// FilialeSale()
|
|
28
28
|
require('system-clients/src/styles/less/bootstrap.less')
|
|
29
29
|
|
|
30
30
|
new Vue({
|