sale-client 3.5.166 → 3.5.168

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.
@@ -10,17 +10,23 @@ 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://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
13
+ var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400'
14
14
  // 公司测试服务
15
- // var fuwu = 'http://192.168.50.4:8400'
15
+ // var fuwu = 'http://192.168.50.4:8450'
16
+ // 梅河口
17
+ // var fuwu = 'http://139.214.92.34:8301'
18
+ // 单县
19
+ // var fuwu = 'http://119.187.112.234:8400'
20
+ // 中盛
16
21
  // var fuwu = 'http://39.99.85.14:8400'
17
- var fuwu = 'http://121.36.60.63:8700/'
18
- // var fuwu = 'http://47.93.217.125:8400'
19
- // var fuwu = 'http://121.36.106.17:8400/'
20
- // 铜川正式
22
+ // 燎原
23
+ var fuwu = 'http://121.40.52.133:9001'
24
+ // 葛华
25
+ // var fuwu = 'http://219.138.226.181:8401'
26
+ // 乌海
27
+ // var fuwu = 'http://203.57.101.233:8400'
28
+ // 铜川
21
29
  // var fuwu = 'http://61.134.55.234:9999/'
22
- // 铜川测试
23
- // var fuwu = 'http://61.134.55.234:9999/'
24
30
  // var fuwu = 'http://60.222.250.39:8300/'
25
31
  // 韶关
26
32
  // var fuwu = 'http://119.146.1.106:8300/'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.166",
3
+ "version": "3.5.168",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -347,6 +347,9 @@
347
347
  import Vue from 'vue'
348
348
 
349
349
  let loadParamGem = async function (self) {
350
+ if (!self.f_filialeid) {
351
+ self.f_filialeid = self.$login.f.orgid
352
+ }
350
353
  await self.$LoadParams.loadParam(self.f_filialeid)
351
354
  }
352
355
 
@@ -555,7 +555,7 @@
555
555
  },
556
556
  //设置自动裁边开启
557
557
  SetAutoCutOn(){
558
- console.log("设置自动采编")
558
+ console.log("设置自动裁边")
559
559
  if(this.iswaiting) return
560
560
  this.iswaiting = true
561
561
  this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open:1,autocutoffset:-3},(msg) => {
@@ -39,5 +39,8 @@ let specialComp = {
39
39
  'file-user-files': (resolve) => { require(['./FileUserFiles'], resolve) },
40
40
  // 用户基本信息
41
41
  'user-base-info-new': (resolve) => { require(['./UserBaseInfoNew'], resolve) },
42
+ // 档案管理新(预备户建档)
43
+ 'file-user-files-new': (resolve) => { require(['./FileUserFiles'], resolve) }
44
+
42
45
  }
43
46
  exports.specialComp = specialComp
@@ -105,7 +105,7 @@ export default {
105
105
  console.log("获取到提示了!!!!",this.warningInfo)
106
106
  if ((!this.warningInfo.data.state.info || !this.warningInfo.data.state.dibao ||
107
107
  !this.warningInfo.data.state.ins|| !this.warningInfo.data.state.blacklist ||
108
- !this.warningInfo.data.state.invoice || !this.warningInfo.data.state.isExtendMeterInfo || !this.warningInfo.data.state.danhu) && obj.f_user_state !== '预备') {
108
+ !this.warningInfo.data.state.invoice || !this.warningInfo.data.state.isExtendMeterInfo || !this.warningInfo.data.state.ruhu) && obj.f_user_state !== '预备') {
109
109
  this.modalrow = obj
110
110
  this.showModal = true
111
111
  return false
@@ -163,6 +163,25 @@
163
163
  </datepicker>
164
164
  </div>
165
165
  </div>
166
+ <div class="row">
167
+ <div class="col-sm-6 form-group">
168
+ <label for="f_user_nature" class="font_normal_body">是否签订合同</label>
169
+ <input type="text" v-show="false" v-model="baseinfo.base.f_is_sign_contract">
170
+ <v-select :value.sync="baseinfo.base.f_is_sign_contract" :search="false" :value-single="true"
171
+ :options='issign' placeholder='是否签订合同' close-on-select>
172
+ </v-select>
173
+ </div>
174
+ <div style="" class="col-sm-6 form-group">
175
+ <label for="f_user_level" class="font_normal_body ">合同签订日期</label>
176
+ <datepicker style="width:60%" placeholder="合同签订日期"
177
+ v-model="baseinfo.base.f_contract_date"
178
+ :value.sync="baseinfo.base.f_contract_date"
179
+ class="datepicker"
180
+ :format="'yyyy-MM-dd HH:mm:ss'"
181
+ :show-reset-button="true">
182
+ </datepicker>
183
+ </div>
184
+ </div>
166
185
  <div class="row">
167
186
  <div style="" class="col-sm-12 form-group">
168
187
  <label for="f_paper_account" class="font_normal_body ">&ensp;备&emsp;&emsp;注</label>
@@ -263,6 +282,7 @@
263
282
  userlevel: this.$appdata.getParam('用户等级'),
264
283
  inputcode: this.$appdata.getSingleValue('用户编号是否手动生成') ?this.$appdata.getSingleValue('用户编号是否手动生成'): '否',
265
284
  housetype: [{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
285
+ issign: [{label: '是', value: '是'}, {label: '否', value: '否'}],
266
286
  jurisdiction: this.$login.r,
267
287
  edituserstate: false,
268
288
  // highMeterPlugin: {},
@@ -6,7 +6,7 @@
6
6
  <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
7
7
  <a style="font-size: 20px;font-weight: 500;">基本信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
8
8
  <button class="button_search" style="width: max-content" v-show="data.baseinfo.base.f_user_nature === '单位'" @click="showUserDevices($index, data.baseinfo)">用户设备信息</button>
9
- <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>
9
+ <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件/查看</button>
10
10
  <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
11
11
  </div>
12
12
  <file-user-essential-info :userphonelist="data.baseinfo.userphonelist" :baseinfo="data.baseinfo" :f_filialeid="f_filialeid" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
@@ -52,7 +52,7 @@
52
52
  @limit="getLimitGas"></limit-gas>
53
53
  <modal :show.sync="showfiles" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
54
54
  <article slot="modal-body">
55
- <upload-idcard :blodid="blodid" isremark="true" @getidinfo="confirmIdCard" style="width:auto" fusetype="档案信息" v-ref:upload></upload-idcard>
55
+ <upload-idcard :blodid="blodid" isremark="true" @getidinfo="confirmIdCard" style="width:auto" fusetype="合同照片" v-ref:upload></upload-idcard>
56
56
  </article>
57
57
  <footer slot="modal-footer" class="modal-footer">
58
58
  </footer>