apply-clients 7.1.36-yuchuan-24 → 7.1.36-yuchuan-26

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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/product/InsuranceApply/InsuranceReport.vue +25 -26
  3. package/src/components/product/Process/Processes/chargeManagement.vue +0 -1
  4. package/src/components/product/Process/Service/ServiceControl.vue +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "7.1.36-yuchuan-24",
3
+ "version": "7.1.36-yuchuan-26",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/product/InsuranceApply/InsuranceReport.vue CHANGED
@@ -25,32 +25,31 @@
25
25
  condition="f_operate_date < '{}'"
26
26
  :show-reset-button="reset">
27
27
  </datepicker>
28
- </div><br>
29
- <!-- <div class="col-sm-2" style="margin-top: -24px">-->
30
- <!-- <label class="font_normal_body" for="f_insurance_company">保险公司：</label>-->
31
- <!-- <v-select-->
32
- <!-- placeholder='请选择'-->
33
- <!-- v-model="model.f_insurance_company"-->
34
- <!-- condition="f_insurance_company = '{}'"-->
35
- <!-- @change="$parent.$parent.changeCompany"-->
36
- <!-- :value.sync="model.f_insurance_company"-->
37
- <!-- :options="$parent.$parent.applyCompany"-->
38
- <!-- :value-single="true"-->
39
- <!-- style="margin-left:-12px"-->
40
- <!-- close-on-select></v-select>-->
41
- <!-- </div>-->
42
- <!-- <div class="col-sm-2" style="margin-top: -24px">-->
43
- <!-- <label class="font_normal_body" for="f_insurance_company">保险类型：</label>-->
44
- <!-- <v-select-->
45
- <!-- placeholder='请选择'-->
46
- <!-- v-model="model.f_insurance_type"-->
47
- <!-- condition="f_insurance_type = '{}'"-->
48
- <!-- :value.sync="model.f_insurance_type"-->
49
- <!-- :options="$parent.$parent.applyType"-->
50
- <!-- :value-single="true"-->
51
- <!-- style="margin-left:-12px"-->
52
- <!-- close-on-select></v-select>-->
53
- <!-- </div>-->
28
+ </div><br> <div class="col-sm-2" style="margin-top: -24px">
29
+ <label class="font_normal_body" for="f_insurance_company">保险公司：</label>
30
+ <v-select
31
+ placeholder='请选择'
32
+ v-model="model.f_insurance_company"
33
+ condition="f_insurance_company = '{}'"
34
+ @change="$parent.$parent.changeCompany"
35
+ :value.sync="model.f_insurance_company"
36
+ :options="$parent.$parent.applyCompany"
37
+ :value-single="true"
38
+ style="margin-left:-12px"
39
+ close-on-select></v-select>
40
+ </div>
41
+ <div class="col-sm-2" style="margin-top: -24px">
42
+ <label class="font_normal_body" for="f_insurance_company">保险类型：</label>
43
+ <v-select
44
+ placeholder='请选择'
45
+ v-model="model.f_insurance_type"
46
+ condition="f_insurance_type = '{}'"
47
+ :value.sync="model.f_insurance_type"
48
+ :options="$parent.$parent.applyType"
49
+ :value-single="true"
50
+ style="margin-left:-12px"
51
+ close-on-select></v-select>
52
+ </div>
54
53
  </div>
55
54
  <div class="span" style = "float:right;">
56
55
  <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
package/src/components/product/Process/Processes/chargeManagement.vue CHANGED
@@ -508,7 +508,6 @@ export default {
508
508
  })
509
509
  }
510
510
  } else if (this.charge.f_bill_style === '专票') {
511
-
512
511
  data = {
513
512
  id: this.charge.f_bill_id
514
513
  }
package/src/components/product/Process/Service/ServiceControl.vue CHANGED
@@ -1149,7 +1149,7 @@ export default {
1149
1149
  async getResidentialArea () {
1150
1150
  let data = {
1151
1151
  tablename: 't_area_address',
1152
- condition: `f_filiale like '%${this.$login.f.orgs}%' and f_area_status = '启用'`
1152
+ condition: `f_filiale in ('${this.$login.f.orgs}','榆林.榆川天然气') and f_area_status = '启用'`
1153
1153
  }
1154
1154
  let http = new HttpResetClass()
1155
1155
  let res = await http.load(
@@ -1940,7 +1940,7 @@ export default {
1940
1940
  let pcdText = `and f_residential_area like '%${val}%'`
1941
1941
  let data = {
1942
1942
  tablename: 't_area_address',
1943
- condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用' ${pcdText}`
1943
+ condition: `f_filiale like '%${this.$login.f.orgs}%' and f_area_status = '启用' ${pcdText}`
1944
1944
  }
1945
1945
  new HttpResetClass().load("POST", `rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
1946
1946
  console.log('请求发送完成！！！！！'+JSON.stringify(res))