apply-clients 3.5.4-2 → 3.5.4-21

package/src/filiale/siyangRH/pc.js

@@ -8,6 +8,7 @@ let specialComp = {
   'apply-charge-list': (resolve) => { require(['./pc/ApplyChargeList'], resolve) },
   'service-control': (resolve) => { require(['./pc/ServiceControl.vue'], resolve) },
   'apply-high-meter': (resolve) => { require(['./pc/HighMeterCard.vue'], resolve) },
+  'apply-charge-management': (resolve) => { require(['./pc/chargeManagement'], resolve) },
   'exploration-user': (resolve) => { require(['./pc/ExplorationUser.vue'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/yangchunboneng/android/AppChargeManagement.vue

@@ -23,6 +23,10 @@
               <p class="col-xs-4 text-left font"><b>收费人员</b></p>
               <p class="col-xs-8 text-left input-font">{{ row.f_charge_collectors }}</p>
             </div>
+            <div class="row">
+              <p class="col-xs-4 text-left font"><b>实际收款日期</b></p>
+              <p class="col-xs-8 text-left input-font">{{row.f_actual_date}}</p>
+            </div>
             <div class="row">
               <p class="col-xs-4 text-left font"><b>收费日期</b></p>
               <p class="col-xs-8 text-left input-font">{{ row.f_charge_date }}</p>

package/src/filiale/yangchunboneng/android/AppExplorationUser.vue

@@ -157,6 +157,18 @@
               <p class="col-xs-3 text-left font"><b>客户编号：</b></p>
               <p :class="[ row.defname =='通气点火' && (row.f_apply_nature=='热水器' || row.f_apply_nature=='壁挂炉') ? 'redy' : (row.f_apply_nature=='热水器' || row.f_apply_nature=='壁挂炉' ? 'pred': (row.defname =='通气点火' ? 'p1':''))]" class="col-xs-9 text-left input-font">{{ row.f_userinfo_code }}</p>
             </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>合同金额：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_contract_money}}</p>
+            </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>已收金额：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_cumulative_payment_money}}</p>
+            </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>未收金额：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_surplus_money}}</p>
+            </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_apply_type }}</p>

package/src/filiale/yangchunboneng/android/AppInstallationMaterial.vue

@@ -385,11 +385,15 @@
       addUserFile() {
         this.material.push({
           f_material_name: "",
-          unit: "",
-          f_material_price: "",
+          unit: 0,
+          f_material_price: 0,
           f_typenumber: "",
           f_typename: "",
-          material_type: ""
+          material_type: "",
+          f_overlength_unitprice:"0",
+          f_overlength_number:"0",
+          f_discounts_money_detail:"0",
+          f_actual_materials_detail:"0"
         })
       },
       getmaterialTYPE() {

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

@@ -12,7 +12,7 @@
         <app-sign :blobid="selectdata.f_process_id" :defname="selectdata.defname" @sign-success="signSuccess" :file-path="selectdata.f_process_id"@sign-clean="signClean"></app-sign>
       </panel>
       <panel header="附件" :is-open="false" type="primary" v-if="selectdata.f_process_id">
-        <app-upload :blobid="selectdata.f_process_id" :isdelete="true" ></app-upload>
+        <app-upload :blobid="selectdata.f_process_id" :pblobid="selectdata.f_parent_process_id" :isdelete="true" :defname="selectdata.defname"></app-upload>
       </panel>
     </accordion>
   </div>
@@ -670,6 +670,22 @@ export default {
       }
       throw '用户信息确认！！！'
     },
+    //通气前置，添加设备
+    async addDeviceBefore () {
+      let http = new HttpResetClass()
+      var condition1=`f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+      let data = {
+        condition: condition1
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getUserFilesAndDevicesAmount`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '获取表具失败！！！'
+      })
+      if (res.data.amount===0) {
+        this.$showMessage('请添加设备！！！', 'warning', 3000)
+        throw null
+      }
+    },
     // 缴费前置
     async chargeBefore () {
       if (Number(this.show_data.f_due_money) > Number(this.show_data.f_cumulative_payment_money) || Number(this.show_data.f_surplus_money) > 0) {

package/src/filiale/yangchunboneng/android/AppSuperServiceControl.vue

@@ -9,7 +9,7 @@
         <app-take-pic :blobid="selectdata.f_process_id" :defname="selectdata.defname" :isdelete="false" :istakepic="false" :istype="false"></app-take-pic>
       </panel>
       <panel header="附件" :is-open="false" type="primary" v-if="selectdata.f_process_id">
-        <app-upload :blobid="selectdata.f_process_id"  :isdelete="true" ></app-upload>
+        <app-upload :blobid="selectdata.f_process_id" :pblobid="selectdata.f_parent_process_id" :isdelete="true" ></app-upload>
       </panel>
     </accordion>
   </div>

package/src/filiale/yangchunboneng/android/AppUpload.vue

@@ -25,12 +25,19 @@
         <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="getFiles">搜索</button>
       </div>
       <div  style="overflow: scroll;display: flex;flex-wrap: wrap;">
-        <div class=" showData" v-for="(index,file) in fileList">
-            <img-self :src="file.f_downloadURL" :width="120" :height="170"></img-self>
-            <img v-if="isdelete" src="../../../../src/assets/删除.png" style="width: 15px;" @click.prevent="delfile(file, index)">
-            <p :title="row.f_uploaddate" class="clears"><strong>上传时间：</strong><span>{{ file.f_uploaddate }}</span></p>
-            <p :title="row.fusetype" class="clears"><strong>使用类型：</strong><span>{{ file.fusetype }}</span></p>
-            <p :title="row.defname" class="clears"><strong>上传节点：</strong><span>{{ file.defname }}</span></p>
+        <div class=" showData" v-for="(index,file) in fileList" >
+          <img-self
+            v-if="file.f_filetype=='jpg'|| file.f_filetype =='png' || file.f_filetype == 'gif' || file.f_filetype == 'bmp'"
+            :src="file.f_downloadURL" :width="120" :height="170"></img-self>
+          <img  style="width: -webkit-fill-available" v-if="file.f_filetype === 'pdf'" src="../../../components/image/pdf.jpg" alt=""/>
+          <img  style="width: -webkit-fill-available"  v-if="file.f_filetype === 'xls'||file.f_filetype === 'xlsx'" src="../../../components/image/excel.jpg" alt=""/>
+          <img  style="width: -webkit-fill-available" v-if="file.f_filetype === 'doc'||file.f_filetype === 'docx'" src="../../../components/image/doc.jpg" alt=""/>
+          <img  style="width: -webkit-fill-available" v-if="file.f_filetype === 'dwg'" src="../../../components/image/dwg.jpg" alt=""  />
+          <img  style="width: -webkit-fill-available"  v-if="file.f_filetype === 'dxf'" src="../../../components/image/dxf.png" alt=""  />
+          <img  v-if="isdelete" src="../../../../src/assets/删除.png" style="width: 15px;" @click.prevent="delfile(file, index)">
+          <p :title="row.f_uploaddate" class="clears"><strong>上传时间：</strong><span>{{ file.f_uploaddate }}</span></p>
+          <p :title="row.fusetype" class="clears"><strong>使用类型：</strong><span>{{ file.fusetype }}</span></p>
+          <p :title="row.defname" class="clears"><strong>上传节点：</strong><span>{{ file.defname }}</span></p>
         </div>
       </div>
     </div>
@@ -43,7 +50,7 @@ import {guid, toStandardTimeString} from '../../../components/Util'
 import Vue from 'vue'
 export default {
   title: '附件',
-  props: ['blobid', 'isdelete'],
+  props: ['blobid', 'isdelete','pblobid', 'defname'],
   data () {
     return {
       fileList: [],
@@ -55,6 +62,36 @@ export default {
     this.getFiles()
   },
   methods: {
+    //查询父工程附件
+    async pgetFiles () {
+      if(this.pblobid==''||this.pblobid==null){
+        return
+      }
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_files',
+        condition: `f_blobid = '${this.pblobid}' `
+      }
+      if (this.type){
+        data.condition += `and fusetype = '${this.type}'`
+      }
+      if (this.defname){
+        data.condition += `and defname = '${this.defname}'`
+      }
+      data.condition += ` order by f_uploaddate desc `
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data: data}, {
+        // let res = await http.load('POST', `rs/sql/apply_singleTable`, {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+
+      for (var i = 0; i < res.data.length; i++) {
+        console.log('-----------地址----------------')
+        console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
+        res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
+        this.fileList.push(res.data[i])
+      }
+    },
     async getFiles () {
       console.log('----------------开始查询图片----------------')
       this.fileList = []
@@ -63,7 +100,7 @@ export default {
 
       let data = {
         tablename: 't_files',
-        condition: `f_blobid = '${this.blobid}' and f_filetype in ('jpg','png')  `
+        condition: `f_blobid = '${this.blobid}'`
       }
       if (this.type){
         data.condition += `and fusetype = '${this.type}'`
@@ -85,8 +122,13 @@ export default {
       }
 
       this.fileList = res.data
+      this.pgetFiles()
     },
     delfile (file, index) {
+      if (this.defname !== file.defname) {
+        this.$showMessage('当前环节和附件上传节点不一致，无法删除')
+        return
+      }
       this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_files`, {id: file.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
         this.$dispatch("delResid", file.id)
         this.getFiles()