apply-clients 7.1.36-1 → 7.1.36-yuchuan-1

package/src/components/product/Process/Processes/chargeManagement.vue

@@ -429,8 +429,13 @@ export default {
             resolveMsg: null,
             rejectMsg: '收费信息更新失败！！！'
           })
-          this.$showAlert('开票失败！！！', 'warning', 3000)
-          throw e
+          this.$showMessage(`开票信息组织失败！！`, ['confirm']).then(async (res) => {
+            if (res === 'confirm') {
+              this.$dispatch('loadPage')
+            }else {
+              this.$dispatch('loadPage')
+            }
+          })
         }
       }else {
         await this.outBill()
@@ -494,8 +499,13 @@ export default {
             resolveMsg: null,
             rejectMsg: '收费信息更新失败！！！'
           })
-
-          throw e
+          this.$showMessage(`开票失败！！`, ['confirm']).then(async (res) => {
+            if (res === 'confirm') {
+              this.$dispatch('loadPage')
+            }else {
+              this.$dispatch('loadPage')
+            }
+          })
         }
       } else if (this.charge.f_bill_style === '专票') {
 
@@ -538,8 +548,13 @@ export default {
             resolveMsg: null,
             rejectMsg: '收费信息更新失败！！！'
           })
-          this.$showAlert('开票失败！！！', 'warning', 3000)
-          throw '开票失败！！'
+          this.$showMessage(`开票失败！！`, ['confirm']).then(async (res) => {
+            if (res === 'confirm') {
+              this.$dispatch('loadPage')
+            }else {
+              this.$dispatch('loadPage')
+            }
+          })
         } else {
           data = {
             id: this.charge.f_bill_id,
@@ -683,4 +698,7 @@ export default {
   font-family: PingFang;
   color: #ffffff;
 }
+.form-control{
+  padding: 8px 12px;
+}
 </style>

package/src/components/product/Process/Processes/devicesManagement.vue

@@ -221,6 +221,7 @@ export default {
         return
       }
       let data = {
+        login: this.$login.f,
         userinfo: row,
         selectdata: this.selectdata
       }
@@ -312,7 +313,7 @@ export default {
   computed: {
     showDeleteUserInfo () {
       return (this.selectdata.f_apply_type === '非民用报建' &&
-        (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察' || this.selectdata.defname === '收费标准')) ||
+        (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察' || this.selectdata.defname === '收费标准' || this.selectdata.defname === '报装缴费')) ||
         (this.selectdata.f_apply_type === '设备拆除' && this.selectdata.defname === '销户')
     },
     disabledBut () {

package/src/components/product/Process/Processes/newInstallationDetails.vue

@@ -423,10 +423,10 @@ export default {
         this.$showAlert('请先选择气表品牌！！！', 'warning', 3000)
         return
       }
-      if (this.newUserfile.f_gasbrand_id && this.newUserfile.f_meternumber) {
+      if (this.newUserfile.f_new_gasbrand_id && this.newUserfile.f_new_meternumber) {
         let data = {
-          f_meternumber: this.newUserfile.f_meternumber,
-          f_gasbrand_id: this.newUserfile.f_gasbrand_id
+          f_meternumber: this.newUserfile.f_new_meternumber,
+          f_gasbrand_id: this.newUserfile.f_new_gasbrand_id
         }
         if (this.newUserfile.f_user_id) {
           data.f_user_id = this.newUserfile.f_user_id

package/src/components/product/Process/Processes/selectChaiChuUserinfo.vue

@@ -0,0 +1,230 @@
+<template>
+  <div style="margin-bottom: 20px" class="form-group select-overspread">
+    <label class="control-label-justify control-label col-sm-3">选择用户</label>
+    <div class="col-sm-10" >
+      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute" @click="openSelect" :disabled="mark === 1">选择</button>
+    </div>
+  </div>
+
+  <modal v-if="showselect" :show.sync="showselect" width="80%" title="用户信息" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body" style="height: 600px!important;">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.$parent.searchCondition' v-ref:cri>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户编号：</label>
+                <input type="text" style="width:60%" class="input_search" placeholder='客户编号' v-model="model.f_userinfo_id"
+                       v-on:keyup.enter="search"
+                       condition="ui.f_userinfo_id = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户名称：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                       v-on:keyup.enter="search" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户电话：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                       v-on:keyup.enter="search" condition="f_user_phone = '{}'" placeholder='客户电话'>
+              </div>
+
+              <div class="form-group col-sm-3 button-range">
+                <button class="button_search button_spacing" @click.prevent="search" v-el:cx>查询</button>
+                <button class="button_clear button_spacing"  @click.prevent="$parent.$parent.$parent.clear()">清空</button>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.$parent.criteriaShow = !$parent.$parent.$parent.criteriaShow"
+                  class="button_spacing"
+                  style="float: right">
+                </div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">小&emsp;&emsp;区：</label>
+                <v-select
+                  v-model="model.f_residential_area"
+                  placeholder='小区'
+                  condition="f_residential_area = '{}'"
+                  :value.sync="model.f_residential_area"
+                   :options='$parent.$parent.$parent.area'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">楼&emsp;&emsp;号：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_building"
+                       v-on:keyup.enter="search" condition="f_building like '%{}%'" placeholder='楼号'>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">单&emsp;&emsp;元：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_unit"
+                       v-on:keyup.enter="search" condition="f_unit like '%{}%'" placeholder='单元'>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">门&nbsp;牌&nbsp;号：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_room"
+                       v-on:keyup.enter="search" condition="f_room like '%{}%'" placeholder='门牌号'>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户地址：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                       v-on:keyup.enter="search" condition="f_address like '%{}%'" placeholder='客户地址'>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" style="height: 100%">
+          <template partial='head'>
+            <tr>
+              <th style="white-space: nowrap;">序号</th>
+              <th style="white-space: nowrap;">客户编号</th>
+              <th style="white-space: nowrap;">客户名称</th>
+              <th style="white-space: nowrap;">客户电话</th>
+              <th style="white-space: nowrap;">地址信息</th>
+              <th style="white-space: nowrap;">选择</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{$index+1}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_userinfo_id }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_name }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_phone }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_address }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>
+                  <button type="button" name="button" class="button_export" @click.prevent="$parent.$parent.$parent.$parent.select(row)">确认选择</button>
+                </font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '选择用户',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showselect: false,
+      model: new PagedList('rs/sql/applyGetUserinfos', 20, null),
+      criteriaShow: false,
+      area: []
+    }
+  },
+  ready () {
+    this.getArea()
+  },
+  methods: {
+    select (row) {
+      this.$dispatch('selectUserinfo', row)
+
+      this.showselect = false
+    },
+    searchCondition (args) {
+      args.condition = `${args.condition} and ui.f_filiale = '${this.$login.f.f_fengongsi}' and ui.f_user_state = '正常'`
+      this.model.search(args.condition, args.model)
+    },
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    openSelect () {
+      this.showselect = true
+      setTimeout(() => {
+        this.$refs.cp.$refs.cri.search()
+      }, 100)
+    },
+    // 获取小区
+    async getArea () {
+      let data = {
+        tablename: 't_area_address',
+        condition: `f_filiale = '${this.$login.f.f_fengongsi}' and f_area_status = '启用'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/applySingleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+      )
+      this.area =  res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.id
+        }
+      })
+    },
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+.control-label-justify {
+  display: inline-block;
+  vertical-align: top;
+  width: 110px;
+  text-align: justify;
+  font-family: PingFang-SC-Bold;
+}
+
+.control-label-justify::after {
+  content: "";
+  display: inline-block;
+  width: 100%;
+  overflow: hidden;
+  height: 0;
+}
+.input_view{
+  padding: 8px;
+  background-color: #ffffff;
+  border-radius: 2px;
+  border: solid 1px #c7c7c7!important;
+  color: #333333!important;
+  font-size: 15px!important;
+}
+
+.input_view[readonly]{
+  border: 1px solid #DDD!important;
+  color:#ACA899!important;
+}
+.input_view:disabled{
+  border: 1px solid #DDD!important;
+  color:#ACA899!important;
+}
+</style>

package/src/components/product/Process/Service/ServiceControl.vue

@@ -128,7 +128,11 @@ export default {
             item.value = []
           }
         }
-
+        if(this.selectdata.state === '结束'){
+          item.readonly = true
+          item.disabled = true
+          console.log('当前defname'+this.selectdata.defname+'当前title'+this.selectdata.title)
+        }
         this.selectdata[item.field] = item.value
       }
 
@@ -138,6 +142,9 @@ export default {
           if (!item.mark) {
             item.mark = 0
           }
+          if(this.selectdata.state === '结束'){
+          item.mark = 1
+        }
         })
       }
 
@@ -199,7 +206,7 @@ export default {
 
       // 初始化 buttons_fields
       for (const item of this.selectdata.buttons) {
-        if (item.button_name === '下发') {
+        if (item.button_name === '下发' || item.button_name === '转派') {
 
           let data = {
             source: item.source,
@@ -256,6 +263,9 @@ export default {
             }
           })
         }
+        if(this.selectdata.state === '结束'){
+          item.hidden = true
+        }
       }
 
       if (this.selectdata.f_apply_nature === '散户' && this.selectdata.defname === '现场勘察') {
@@ -481,6 +491,9 @@ export default {
       if ((this.show_data.f_apply_type === '民用报建' && this.show_data.f_apply_nature === '小区') || this.show_data.f_apply_type === '非民用报建') {
         return
       }
+      if (this.show_data.f_house_type === '旧报建导入'){
+        return
+      }
       if (Number(this.show_data.f_due_money) > Number(this.show_data.f_cumulative_payment_money) || Number(this.show_data.f_surplus_money) > 0) {
         this.$showAlert('费用未结清！！！', 'warning', 3000)
         throw null
@@ -506,7 +519,7 @@ export default {
     // 获取设计人员
     async getDesignerPeople () {
       let data = {
-        source: 'this.getParentByType($organization$).getChildByName($营业厅报装$).getChildren()',
+        source: 'this.getParentByType($organization$).getChildByName($设计人员$).getChildren()',
         userid: this.$login.f.id
       }
 
@@ -519,7 +532,7 @@ export default {
       return res.data.map(item => {
         return {
           label: item.name,
-          value: item.id
+          value: item.name
         }
       })
     },
@@ -774,6 +787,7 @@ export default {
         }
       }))
     },
+    //查询现场负责人
     async getConstructionWorker(){
       let data = {
         source: 'this.getParentByType($organization$).getChildByName($建设单位$).getChildren()',
@@ -781,7 +795,7 @@ export default {
       }
 
       let res = await this.$resetpost(
-        `${this.$androidUtil.getProxyUrl()}/rs/search`,
+        `rs/search`,
         {data: data},
         {resolveMsg: null, rejectMsg: '现场负责人查询失败！！！'}
       )
@@ -844,6 +858,29 @@ export default {
         userid: this.$login.f.id
       }
 
+      let res = await this.$resetpost(
+        'rs/search',
+        {data: data},
+        {resolveMsg: null, rejectMsg: '安装单位负责人查询失败！！！'}
+      )
+      console.log("显示返回值",res)
+      let constructionUnit = res.data.map(item => {
+        return {
+          label: item.name,
+          value: item.id
+        }
+      })
+      constructionUnit = constructionUnit.sort((a,b) => a.value - b.value)
+      console.log("显示返回值1",constructionUnit)
+      return constructionUnit
+    },
+    // 管线施工单位
+    async getGuanXianBuildUnit () {
+      let data = {
+        source: 'this.getParentByType($organization$).getChildByName($工程施工队$).getChildren()',
+        userid: this.$login.f.id
+      }
+
       let res = await this.$resetpost(
         'rs/search',
         {data: data},
@@ -853,7 +890,7 @@ export default {
       return res.data.map(item => {
         return {
           label: item.name,
-          value: item.id
+          value: item.name
         }
       })
     },
@@ -902,6 +939,26 @@ export default {
         }
       })
     },
+    // 管线监理单位
+    async getSupervisorName () {
+      let data = {
+        source: 'this.getParentByType($organization$).getChildByName($监理单位$).getChildren()',
+        userid: this.$login.f.id
+      }
+
+      let res = await this.$resetpost(
+        'rs/search',
+        {data: data},
+        {resolveMsg: null, rejectMsg: '监理单位人员查询失败！！！'}
+      )
+      return res.data.map(item => {
+        return {
+          label: item.name,
+          value: item.name
+        }
+      })
+    },
+
     // 监理现场负责人
     async getSupervisorOperatorId () {
       let data = {
@@ -942,6 +999,28 @@ export default {
       result.push({label:'无',value:'无'})
       return result
     },
+    // 管线土建单位
+    async getEngineeringName () {
+      let data = {
+        source: 'this.getParentByType($organization$).getChildByName($土建单位$).getChildren()',
+        userid: this.$login.f.id
+      }
+
+      let res = await this.$resetpost(
+        'rs/search',
+        {data: data},
+        {resolveMsg: null, rejectMsg: '土建单位人员查询失败！！！'}
+      )
+      let result = res.data.map(item => {
+        return {
+          label: item.name,
+          value: item.name
+        }
+      })
+      result.push({label:'用户自理',value:'用户自理'})
+      result.push({label:'无',value:'无'})
+      return result
+    },
     // 检测单位
     async getCheckOperator () {
       let data = {
@@ -964,6 +1043,28 @@ export default {
       result.push({label:'无',value:'无'})
       return result
     },
+    // 管线检测单位
+    async getCheckName () {
+      let data = {
+        source: 'this.getParentByType($organization$).getChildByName($检测单位$).getChildren()',
+        userid: this.$login.f.id
+      }
+
+      let res = await this.$resetpost(
+        'rs/search',
+        {data: data},
+        {resolveMsg: null, rejectMsg: '检测单位人员查询失败！！！'}
+      )
+
+      let result = res.data.map(item => {
+        return {
+          label: item.name,
+          value: item.name
+        }
+      })
+      result.push({label:'无',value:'无'})
+      return result
+    },
     // 获取气表品牌
     async getMeterBrand () {
       let data = {
@@ -1024,6 +1125,7 @@ export default {
         }
       })
     },
+    //获取燃气公司内部签署人
     async getContractSignatory () {
       let data = {
         condition: `asj.f_type = '内部' and asj.f_subject_type = '企业' and asj.f_state = '有效' and asj.f_auth_state = '审核通过' and asg.f_state = '有效' and asg.f_sign_state = '签章成功'`
@@ -1096,7 +1198,7 @@ export default {
         {resolveMsg: null, rejectMsg: null}
       )
     },
-    // 生成合同编号
+    // 生成合同编号（已作废）
     async getContractNumber() {
       const nowDate = new Date()
       let year = nowDate.getFullYear()
@@ -1132,6 +1234,7 @@ export default {
         this.setLabelValue('供气合同编号',gongQiContractNumber)
       }
     },
+    //获取气价列表
     async getPrice (index) {
       if (isEmpty(this.show_data.f_gas_nature) || isEmpty(this.show_data.f_price_type)) {
         return
@@ -1257,13 +1360,16 @@ export default {
         {data: data},
         {resolveMsg: null, rejectMsg: null}
       )
-      for (const item of this.selectdata.fields) {
-        if (item.label === '缴费日期') {
-          item.value = res.data[0].finishtime
-          this.selectdata[item.field] = item.value
+      if (res.data[0]) {
+        for (const item of this.selectdata.fields) {
+          if (item.label === '缴费日期') {
+            item.value = res.data[0].finishtime
+            this.selectdata[item.field] = item.value
+          }
         }
       }
     },
+    //获取工程施工时各部门当前签字环节
     async getSingAct() {
       let data = {
         f_process_id: this.selectdata.f_process_id
@@ -1284,6 +1390,7 @@ export default {
         }
       }
     },
+    //获取土建的乙方
     getYiFang() {
       return [{label: '榆林榆川天然气', value: '榆林榆川天然气'},
         {label: this.selectdata.f_user_name, value: this.selectdata.f_user_name},
@@ -1334,7 +1441,25 @@ export default {
           , '户内施工备注', '庭院出单日期', '庭院回单日期', '庭院施工备注', '是否发起签字', '签字是否完成', '签字所在环节')
         this.requiredLabels('现场项目负责人', '安装单位', '安装单位现场负责人','建设单位', '监理单位', '土建单位', '检测单位', '现场项目负责人', '是否发起签字', '签字是否完成', '签字所在环节')
       }
-    }
+    },
+    //拆除流程核对气量提交
+    async gasCheckBefore() {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_files',
+        condition: `f_blobid = '${this.selectdata.f_process_id}' and defname = '${this.selectdata.defname}' and fusetype = '气量核对单'`
+      }
+      let res = await http.load(
+        'POST',
+        `rs/sql/applySingleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: null}
+      )
+      if (res.data.length <= 0) {
+        this.$showMessage('气量核对单未上传，无法提交！！！')
+        throw '气量核对单未上传，无法提交！'
+      }
+    },
   },
   events: {
     // 强制开关阀
@@ -1433,7 +1558,10 @@ export default {
       if (row.f_address_detail){
         this.setLabelValue('详细地址', row.f_address_detail)
       }
-
+      if (this.show_data.f_apply_type === '改线业务'){
+        this.setLabelValue('工程名称', row.f_user_name)
+        this.setLabelValue('联系电话', row.f_user_phone)
+      }
       this.show_data.f_address_detail = row.f_address_detail
       this.show_data.f_residential_area = row.f_residential_area
       this.show_data.unit = row.unit
@@ -1445,10 +1573,23 @@ export default {
       this.show_data.f_paper_account = row.f_paper_account
       this.show_data.f_userinfo_id = row.f_userinfo_id
       console.log("当前数据",this.show_data)
+      if (this.show_data.f_apply_type === '设备拆除'){
+        let data = {
+          userinfo: row,
+          apply: this.show_data,
+          loginUser: this.$login.f
+        }
+        let res = await this.$resetpost(
+          `rs/logic/addChaiChuUser`,
+          {data: data},
+          {resolveMsg: '添加拆除用户成功！！！', rejectMsg: '添加拆除用户失败！！！'}
+        )
+        this.$dispatch('breakControl', this.show_data)
+      }
     },
     async 'priceReadEvent' (index) {
       await this.setContractSignatory()
-      await this.getContractNumber()
+      // await this.getContractNumber()
       await this.getPrice(index)
       await this.priceChange()
     },
@@ -1698,6 +1839,13 @@ export default {
         return
       }
     },
+    // 土建单位失去焦点
+    'judgmentEngineering' (index) {
+      if (this.show_data.f_engineering_operator_id === '无' && this.show_data.f_civil_engineering !== "无") {
+        this.$showAlert('土建单位未选择请注意！！！', 'warning', 3000)
+        throw null
+      }
+    },
     // 报建性质失去焦点
     'applyNatureChange' (index) {
       if (this.show_data.f_apply_nature === '散户') {
@@ -1797,6 +1945,13 @@ export default {
         this.hideLabels('纠纷原因')
       }
     },
+    //金额大小写转换
+    'applyCapitalizedAmount' (index){
+      // 通过正则过滤小数点后两位
+      let money = (this.show_data.fields[index].value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
+      this.setLabelValue('应交金额大写',this.smalltoBIG(money))
+    },
+
     // ===========================================
     'initializtionView' () {
       if (this.show_data.f_apply_nature === '散户') {