apply-clients 3.5.4-8 → 3.5.4-80

package/src/filiale/fugou/android/AppServiceControl.vue

@@ -52,6 +52,10 @@ export default {
     this.refurbish()
   },
   methods: {
+    /*获取服务人*/
+    getServicPeo(){
+      this.setLabelValue("服务人",Vue.user.name)
+    },
     async buttonCommit() {
       if(this.show_data.button.button_name){
         this.$refs.serviceview.disablebtu()
@@ -639,6 +643,7 @@ export default {
       this.$nextTick(() => {
         this.showview = true
       })
+      this.getServicPeo()
     },
     signClean () {
       this.selectdata.f_construction_sign = null
@@ -968,6 +973,18 @@ export default {
         this.$showAlert('费用未结清！！！', 'warning', 3000)
         throw null
       }
+      if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname==="通气点火"){
+        let  ventilation = this.getLableValue('是否具备通气条件')
+        if(ventilation==='否'){
+          let remark=this.getLableValue('通气备注')
+          if(isEmpty(remark)){
+            this.$showMessage(`不满足通气条件，请进行拍照,并备注说明！！！`)
+            throw null
+          }else{
+            this.$showMessage(`不满足通气条件，请进行拍照！！！`)
+          }
+        }
+      }
     },
     //通气点火前置
     async ventilationBefore() {
@@ -1368,6 +1385,8 @@ export default {
       )
 
       this.setLabelValue('应交金额', res.data)
+      var bag=this.smalltoBIG(this.show_data.f_contract_money)
+      this.setLabelValue('金额大写', bag)
     },
     // ===========================================
     async 'button'() {
@@ -1590,13 +1609,14 @@ export default {
       this.show_data.f_userinfo_code = row.f_userinfo_code
     },
     // 地址类型失去焦点
+    // 地址类型失去焦点
     'addressTypeChange' (index) {
       this.setLabelValue('街道/乡镇', null)
       this.setLabelValue('集收单位', null)
       let f_address_type = this.show_data.fields[index].value
       for (const item of this.show_data.fields) {
         if (f_address_type === '民用市区') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号' || item.label === '小区') {
+          if ( item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '小区') {
             item.hidden = false
             item.required = true
             item.value = null
@@ -1612,7 +1632,7 @@ export default {
           }
         }
         if (f_address_type === '民用乡镇') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号'|| item.label === '小区') {
+          if ( item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '小区') {
             item.hidden = false
             item.required = true
             item.value = null
@@ -1633,7 +1653,7 @@ export default {
           }
         }
         if (f_address_type === '特殊地址') {
-          if (item.label === '区/县' || item.label === '街道/乡镇') {
+          if ( item.label === '街道/乡镇') {
             item.hidden = false
             item.required = true
             item.value = null
@@ -1643,7 +1663,7 @@ export default {
             item.required = false
             item.value = null
           }
-          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' ) {
             item.hidden = true
             item.required = false
             item.value = null
@@ -1654,6 +1674,7 @@ export default {
           }
         }
       }
+      this.pcdChange()
     },
     async 'searchArea' (area, index) {
       let data = {
@@ -1717,7 +1738,19 @@ export default {
         this.electiveLabels('片区', '地址类型',)
       }
     },
-    'onblur' (index) {},
+    'onblur' (index) {
+      if(this.show_data.fields[index].label==="优惠金额"){
+        let contract=this.getLableValue('合同金额')
+        let add=this.getLableValue('追加款')
+        let money = this.getLableValue('优惠金额')
+        //转为数字，然后contract减去money，保留两位小数
+        let money_num = parseFloat(money)
+        let add_num = parseFloat(add)
+        let contract_num = parseFloat(contract)
+        let new_contract = contract_num+add_num - money_num
+        this.setLabelValue('应交金额', new_contract.toFixed(2))
+      }
+    },
     'oninput' (index) {},
     'initializtionView' () {},
     async 'onchangeModal' (index, fieldIndex) {

package/src/filiale/fugou/android/AppZhihuanManagement.vue

@@ -0,0 +1,191 @@
+<template>
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">序号</th>
+          <th class="textNoLineBreak">检查项目</th>
+          <th class="textNoLineBreak">检查结果</th>
+          <th class="textNoLineBreak">操作</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;" >
+            <nobr>{{row.f_check_list}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_check_value}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>
+              <button
+                type="button"
+                name="button"
+                class="btn btn-link"
+                @click="$parent.$parent.showModal(row)"
+              >修改</button>
+            </nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <validator name="v">
+      <modal v-if="showCheckModel" :show.sync="showCheckModel" v-ref:modal :large="true" :backdrop="false" title="收费明细">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+          <h4 class="modal-title">检查明细</h4>
+        </header>
+        <article slot="modal-body" class="modal-body clearfix">
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">检查项目：</label>
+            <div class="col-sm-10">
+              <textarea width="100%" rows="3" v-model="checkList.f_check_list"></textarea>
+            </div>
+
+          </div>
+          <div class="form-group col-sm-12" >
+            <label class="col-sm-2 control-label">检查结果：</label>
+            <div class="col-sm-10">
+              <input-select
+                placeholder='请选择' width="100%"
+                v-model="checkList.f_check_value"
+                :value.sync="checkList.f_check_value"
+                :options='item'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <app-check-take-pic
+            :blobid="selectdata.f_process_id"
+            :flag="flag"
+            :defname="selectdata.defname"
+            :isdelete="true"
+            :istakepic="true"
+            :istype="true">
+          </app-check-take-pic>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="save()">保存</button>
+        </footer>
+      </modal>
+    </validator>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '检查项管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+  },
+  data () {
+    return {
+      model: {
+        data: null
+      },
+      flag:0,
+      showCheckModel: false,
+      checkList:{},
+      item: [{label: '是', value: '是'},{label: '否', value: '否'}],
+      hasList:false,
+      savelist:[]
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    async save(){
+      let res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/apply/rs/entity/t_apply_check`,
+        this.checkList,
+        {resolveMsg: null, rejectMsg: '数据保存失败！！！'}
+      )
+      if(res){
+        this.showCheckModel=false
+        this.search()
+      }
+    },
+    showModal(row){
+      this.checkList=row
+      this.flag=this.selectdata.f_apply_num+row.id
+      this.showCheckModel=true
+    },
+    closeModal() {
+      this.showCheckModel=false
+    },
+    //如果是第一次，则新保存检查想到数据库
+    async saveCheck() {
+      if (this.hasList === false) {
+        this.savelist = []
+        let checkList = this.$appdata.getParam("报建检查项目")
+        //遍历数组,获取数组中的每一个对象，并获取对象的value
+        for (let i = 0; i < checkList.length; i++) {
+          let obj = checkList[i]
+          let value = obj.value
+          this.savelist.push(value)
+        }
+        //保存到数据库
+        let http = new HttpResetClass()
+        let data = {
+          apply: this.selectdata,
+          user: Vue.user,
+          check:this.savelist
+        }
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addApplyCheck`, {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '添加失败！！！'
+        })
+      }
+    },
+    //查询
+    async search() {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_apply_check',
+        condition: `f_process_id= '${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '检查项查询失败！！！'
+      })
+      if(res.data.length>0){
+        this.model.data=res.data
+      }else{
+        this.saveCheck()
+      }
+    }
+  },
+  events: {
+  },
+  computed: {
+    CheckItems() {
+      return this.$appdata.getParam("报建检查项目")
+    }
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+.textNoLineBreak {
+  white-space: nowrap;
+}
+.head-but{
+  margin-left: 5px;
+  height: 34px;
+  /*background-color: #6aa6e2;*/
+  border-radius: 4px;
+  font-family: PingFang;
+  color: #ffffff;
+}
+</style>

package/src/filiale/fugou/android.js

@@ -4,6 +4,12 @@ let specialComp = {
   'app-service-view': (resolve) => { require(['./android/AppServiceView'], resolve) },
   'app-exploration-user': (resolve) => { require(['./android/AppExplorationUser'], resolve) },
   'app-service-control': (resolve) => { require(['./android/AppServiceControl'], resolve) },
-  'app-charge-management': (resolve) => { require(['./android/AppChargeManagement'], resolve) }
+  'app-zhihuan-management': (resolve) => { require(['./android/AppZhihuanManagement'], resolve) },
+  'app-charge-management': (resolve) => { require(['./android/AppChargeManagement'], resolve) },
+  'app-add-material-science': (resolve) => { require(['./android/AppAddMaterialScience'], resolve) },
+  'app-installation-details': (resolve) => { require(['./android/AppInstallationDetails'], resolve) },
+  'app-apply-replacement': (resolve) => { require(['./android/AppAddReplacement'], resolve) },
+  'app-apply-devices-management': (resolve) => { require(['./android/AppDevicesManagement'], resolve) }
+
 }
 exports.specialComp = specialComp

package/src/filiale/fugou/pc/AddReplacement.vue

@@ -0,0 +1,340 @@
+<template>
+  <div>
+    <data-grid :model="onetomany" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">记录人</th>
+          <th class="textNoLineBreak">添加日期</th>
+          <th class="textNoLineBreak">设备</th>
+          <th class="textNoLineBreak">内容</th>
+          <th class="textNoLineBreak" >
+            <button  v-if="$parent.$parent.mark === 0"    type="button" class="btn btn-primary" @click="$parent.$parent.openMaterialModal()">添加
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operator}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operation_date}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_content}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>
+             {{$parent.$parent.toArry(row.f_content_value)}}
+            </nobr>
+          </td>
+          <td style="text-align: center;">
+            <button v-if="$parent.$parent.mark === 0" type="button" class="button_delete button_spacing" @click="$parent.$parent.deletelogs(row)">删除
+            </button>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <modal v-if="showMaterialModal" :show.sync="showMaterialModal" v-ref:modal :large="true"
+           :backdrop="false" :title="title">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeMaterials"><span>&times;</span></button>
+        <h4 class="modal-title">{{title}}</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="form-group col-sm-6">
+          <label class="col-sm-4 control-label">设备：</label>
+          <div class="col-sm-8">
+            <input-select
+              class="select select_list"
+              :value.sync="device"
+              v-model="device"
+              :options="logOptions"
+              :disable="mark === 1"
+              :valueSingle="true"></input-select>
+          </div>
+        </div>
+        <div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
+          <div class="panel-body">
+            <div class="row">
+              <div class="form-group col-sm-6">
+                <label class="col-sm-4 control-label">内容：</label>
+                <div class="col-sm-8">
+                  <input-select
+                    class="select select_list"
+                    :value.sync="item.f_content"
+                    v-model="item.f_content"
+                    :options="Options"
+                    :disable="mark === 1"
+                    :valueSingle="true"></input-select>
+                </div>
+              </div>
+              <div class="form-group col-sm-6">
+                <label class="col-sm-4 control-label">值：</label>
+                <div class="col-sm-8">
+                  <input
+                    class="form-control"
+                    v-model="item.f_content_value"
+                    :value.sync="item.f_content_value"
+                    rows="3"
+                    :readonly="mark === 1"
+                  ></input>
+                </div>
+              </div>
+              <div v-if="mark !== 1 && materials.length > 1" class="form-group col-sm-12 text-center">
+                <button type="button" class="btn btn-danger" @click="removeMaterial(i)">
+                  <i class="fa fa-minus"></i> 移除
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-if="mark !== 1" class="form-group col-sm-12 text-center">
+          <button type="button" class="btn btn-success" @click="addMaterial()">
+            <i class="fa fa-plus"></i> 添加
+          </button>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <template v-if="mark!== 1">
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addlogs()"
+                  :disabled="!$v.valid">确认
+          </button>
+        </template>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    name: 'replacement',
+    props: {
+      selectdata: {
+        type: Object
+      },
+     mark: {
+        type: Number,
+        default: 0
+      }
+    },
+    data() {
+      return {
+        onetomany: {
+          rows: []
+        },
+        logOptions: this.$appdata.getParam('置换设备'),
+        Options: this.$appdata.getParam('置换内容'),
+        device:'',
+        title: '新增',
+        deviceArry:[],
+        showMaterialModal: false,
+        materials: [
+          {
+
+          }
+        ],
+        meterialOptions: [],
+        row: {},
+        bjqChecklag:[],
+        fmaterialname:{}
+      }
+    },
+    ready() {
+      this.getOnetoManyData()
+    },
+    methods: {
+      toArry(row){
+        //将row放进数组中
+        if (!row) return "无";
+        try {
+          // 添加方括号使其成为有效的JSON数组
+          const jsonStr = '[' + row + ']';
+          // 尝试解析字符串为JSON数组
+          const jsonArray = JSON.parse(jsonStr);
+          // 将解析后的数据保存到deviceArry中
+          this.deviceArry = jsonArray;
+
+          // 格式化显示数据
+          let result = '';
+          for (let i = 0; i < this.deviceArry.length; i++) {
+            const item = this.deviceArry[i];
+            result += `${item.f_content}：${item.f_content_value}`;
+            if (i < this.deviceArry.length - 1) {
+              result += '，';
+            }
+          }
+          return result;
+        } catch (err) {
+          console.error('解析JSON数据失败:', err);
+          return "无";
+        }
+      },
+      look(row){
+        this.title = '查看'
+        this.materials = [
+          {
+            id: row.id,
+            f_log_type:row.f_log_type,
+            f_log_content:row.f_log_content
+          }
+        ],
+          this.showMaterialModal = true
+      },
+
+      changelogs(){
+        let http = new HttpResetClass()
+        let data = {
+          data: {
+            id: this.materials[0].id,
+            f_process_id:this.selectdata.f_process_id,
+            f_log_type:this.materials[0].f_log_type,
+            f_log_content:this.materials[0].f_log_content,
+            user:this.$login.f
+          }
+        }
+        http.load(
+          'POST',
+          `/rs/logic/addLogs`,
+          data,
+          {resolveMsg: '修改成功', rejectMsg: '添加失败'}
+        ).then(res => {
+          this.closeMaterials()
+        })
+      },
+      addlogs(){
+        let  value=[]
+        let http = new HttpResetClass()
+        this.materials.forEach(material => {
+          let  obj={}
+          obj.f_content=material.f_content
+          obj.f_content_value=material.f_content_value
+          //obj转为字符串
+          obj = JSON.stringify(obj)
+          value.push(obj)
+        });
+        let s = {
+          f_process_id: this.selectdata.f_process_id,
+          f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+          f_content_value:`${value}` ,
+          f_content: this.device,
+          f_operator: this.$login.f.name,
+          f_operator_id: this.$login.f.id
+        }
+        let data = {
+          tableName: 't_replacement',
+          model: s
+        }
+        http.load(
+          'POST',
+          `/rs/logic/entitySingleTable`,
+          data,
+          {resolveMsg: null, rejectMsg: '添加失败'}
+        ).then(res => {
+          this.getOnetoManyData()
+          this.showMaterialModal=false
+        })
+      },
+      deletelogs(row){
+        let http = new HttpResetClass()
+        this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let data = {
+              tableName:'t_replacement',
+              id:row.id
+            }
+            http.load(
+              'POST',
+              `/rs/logic/delentitySingleTable`,
+              data,
+              {resolveMsg: '删除成功', rejectMsg: '删除失败'}
+            ).then(res => {
+              this.getOnetoManyData()
+            })
+          }
+        })
+      },
+      async getOnetoManyData () {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: `t_replacement`,
+          condition: `f_process_id='${this.selectdata.f_process_id}'`
+        }
+        let res = await http.load(
+          'POST',
+          `/rs/sql/apply_singleTable?aaa=123`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
+        )
+        this.onetomany.rows = res.data
+      },
+      async openMaterialModal() {
+        this.title = '新增'
+        this.materials = [
+          {
+            f_devices: '',
+            f_content: '',
+            f_content_value: ''
+          }
+        ];
+        this.showMaterialModal = true
+      },
+
+      closeMaterials() {
+        this.getOnetoManyData()
+        this.showMaterialModal = false
+      },
+      removeMaterial(index) {
+        if (this.materials.length > 1) {
+          this.materials.splice(index, 1);
+        } else {
+          this.$showMessage('至少需要保留一组数据');
+        }
+      },
+      addMaterial() {
+        // 获取最后一个材料的设备值，如果存在的话
+        const lastDevice = this.materials.length > 0 ? this.materials[this.materials.length - 1].f_devices : '';
+
+        this.materials.push({
+          f_devices: lastDevice, // 复制上一个设备的值
+          f_content: '',
+          f_content_value: ''
+        });
+      },
+    }
+  }
+
+</script>
+
+<style scoped>
+.panel-info {
+  border: 1px solid #bce8f1;
+  margin-bottom: 15px;
+}
+
+.panel-heading {
+  background-color: #d9edf7;
+  border-bottom: 1px solid #bce8f1;
+  color: #31708f;
+  padding: 10px 15px;
+}
+
+.panel-body {
+  padding: 15px;
+}
+
+.form-group {
+  margin-bottom: 15px;
+}
+
+.btn-success {
+  margin-top: 10px;
+}
+
+.modal-body {
+  max-height: 500px;
+  overflow-y: auto;
+}
+</style>