apply-clients 3.4.53 → 3.4.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.4.53",
+  "version": "3.4.55",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -96,7 +96,7 @@
     "system-clients": "3.1.87",
     "system-phone": "1.2.80-49",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.33",
+    "vue-client": "1.24.74",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -253,6 +253,12 @@
         let temp = JSON.parse(JSON.stringify(this.selectdata))
 
         this.show_data = temp
+        for (const item of this.show_data.fields) {
+          debugger
+          if(item.label==='气价名称'){
+            item.value=this.show_data.f_price_name
+          }
+        }
         this.$nextTick(() => {
           this.showview = true
         })
@@ -494,7 +500,7 @@
         })
       },
       async getPrice (f_price_id) {
-        console.log('=======================')
+       /* console.log('=======================')
         console.log(f_price_id)
 
         let data = {
@@ -517,7 +523,7 @@
             label: item.f_price_name,
             value: item
           }
-        })
+        })*/
       },
       materialSupervisory () {
         if (this.selectdata.userid === this.$login.f.id) {
@@ -651,10 +657,10 @@
       },
       // 通气点火初始化
       async 'gasReadyEvent' () {
-        if (!isEmpty(this.show_data.f_price_id)) {
+        /*if (!isEmpty(this.show_data.f_price_id)) {
           let priceList = await this.getPrice(this.show_data.f_price_id)
           this.setLabelValue('气价名称', priceList[0].value)
-        }
+        }*/
 
 
         // 保险初始化显示内容

package/src/filiale/guangxi/android/Process/Processes/AppAddMaterialScience.vue

@@ -340,6 +340,7 @@
       // 新增材料
       async addMaterial() {
         this.title = '新增'
+        var mater_Code=this.getProjectNum() + Math.floor(Math.random() * 10000)
         let data = {
           selectdata: this.selectdata,
           f_process_id: this.selectdata.f_process_id,
@@ -349,6 +350,7 @@
           f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
           f_orgid: Vue.user.orgid,
           f_orgname: Vue.user.orgs,
+          f_material_code:mater_Code,
           materials: this.materials
         }
 
@@ -364,7 +366,55 @@
           `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
           data
         )
-        this.closeMaterials()
+        if(res.data == 200){
+          this.contractMoney = 0
+          for(var i=0;i<this.materials.length; i++){
+            this.contractMoney =parseFloat(parseFloat(this.materials[i].f_material_money)+ parseFloat(this.contractMoney)).toFixed(2)
+          }
+          let contractbu={
+            f_process_id :this.selectdata.f_process_id,//项目节点编号
+            f_apply_num : this.selectdata.f_apply_num,  //项目编号
+            f_contract_number:mater_Code,          //协议编号
+            f_contract_type: '材料代购',           //协议类型
+            f_contract_money:this.contractMoney ,           //协议金额
+            f_contract_time:new Date().Format('yyyy-MM-dd HH:mm:ss'),//协议创造时间
+            f_contract_status: '有效',                 //协议是否有效
+            f_remarks :'材料代购',                      //备注
+            f_operator:this.$login.f.name,                //操作人
+            f_date :new Date().Format('yyyy-MM-dd HH:mm:ss'),//操作时间
+            f_department : this.$login.f.f_department_name, //部门
+            f_filiale :this.$login.f.orgs                  //组织名称
+          }
+          let data1 ={
+            contract:contractbu
+          }
+          let http1 = new HttpResetClass()
+          let res = await http1.load(
+            'POST',
+            `${this.$androidUtil.getProxyUrl()}/rs/logic/NewAddMaterContract`,
+            {data: data1},
+            {resolveMsg: null, rejectMsg: '补充协议成功！！！'}
+          )
+            this.closeMaterials()
+        }
+      },
+      getProjectNum () {
+        const projectTime = new Date() // 当前中国标准时间
+        const Year = projectTime.getFullYear() // 获取当前年份 支持IE和火狐浏览器.
+        const Month = projectTime.getMonth() + 1 // 获取中国区月份
+        const Day = projectTime.getDate() // 获取几号
+        var CurrentDate = Year
+        if (Month >= 10) { // 判断月份和几号是否大于10或者小于10
+          CurrentDate += Month
+        } else {
+          CurrentDate += '0' + Month
+        }
+        if (Day >= 10) {
+          CurrentDate += Day
+        } else {
+          CurrentDate += '0' + Day
+        }
+        return CurrentDate
       },
       async deleteMaterial(row) {
         debugger

package/src/filiale/guangxi/android/Process/Processes/AppChargeManagement.vue

@@ -122,7 +122,21 @@
             </div>
           </div>
         </div>
-        <div class="row" style="display: flex"> <button type="button" style="margin: 0 auto;" class="btn btn-primary" @click.prevent="addPaymentTerms()">增加收费项目</button> </div>
+        <div class="form-group col-sm-12" :class="[$v.f_payment_method.required ? 'has-error' : '']">
+          <label class="col-sm-2 control-label">付款方式：</label>
+          <div class="col-sm-10">
+            <input type="text" v-show="false" v-model="charge.f_payment_method" v-validate:f_payment_method = "['required']" >
+            <input-select
+              placeholder='请选择' width="100%"
+              v-model="charge.f_payment_method"
+              :value.sync="charge.f_payment_method"
+              :options='paymentMethod'
+              class="select select_list"
+              :value-single="true"
+              close-on-select ></input-select>
+          </div>
+        </div>
+       <!-- <div class="row" style="display: flex"> <button type="button" style="margin: 0 auto;" class="btn btn-primary" @click.prevent="addPaymentTerms()">增加收费项目</button> </div>-->
         <div class="form-group row vertical-center">
           <label class="col-xs-4 control-label">应交总金额：</label>
           <div class="col-xs-8">
@@ -149,7 +163,7 @@
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click.prevent="openQrCode()">确认</button>
+        <button type="button" class="btn btn-primary" @click.prevent="saveCharge()">确认</button>
       </footer>
     </modal>
 
@@ -216,24 +230,6 @@ export default {
   },
   ready () {
     this.search()
-    if (Vue.user.orgid == '10101') {
-      console.log('zhoukou')
-      this.filiale = 'zhoukou'
-    }else if (Vue.user.orgid == '35520') {
-      console.log('xiangcheng')
-      this.filiale = 'xiangcheng'
-    }else if (Vue.user.orgid == '35532') {
-      console.log('luyi')
-      this.filiale = 'luyi'
-    }else if (Vue.user.orgid == '35538') {
-      console.log('dancheng')
-      this.filiale = 'dancheng'
-    }else if (Vue.user.orgid == '35526') {
-      console.log('xihua')
-      this.filiale = 'xihua'
-    }else {
-      this.$showMessage('分公司异常，请联系管理员！')
-    }
   },
   methods: {
     addPaymentTerms(){
@@ -254,7 +250,7 @@ export default {
       })
       this.selectdata = res.data
 
-      this.$dispatch('breakControl')
+      this.$dispatch('breakControl',this.selectdata)
     },
     // 获取订单信息
     async getOrderInformation () {
@@ -290,7 +286,6 @@ export default {
         // 清除二维码
         this.clearQrCode()
         this.showQrCode = false
-
         this.saveCharge()
       }
     },
@@ -392,8 +387,6 @@ export default {
           this.$showMessage('订单生成失败')
         }
       })
-
-
     },
     accMul(arg1,arg2) {
       let m = 0, s1 = arg1.toString(), s2 = arg2.toString();
@@ -432,7 +425,7 @@ export default {
     clearQrCode () {
       document.getElementById('qrcode').innerHTML = ''
     },
-    moneyChange (index) {
+ /*   moneyChange (index) {
       console.log(`当前下标----${index}`)
       if (isEmpty(this.charge.payment_terms[index].f_charge_money) || Number(this.charge.payment_terms[index].f_charge_money) === 0) {
         this.$showAlert('单笔收费不能为0元！！！', 'warning', 3000)
@@ -440,8 +433,8 @@ export default {
         return
       }
 
-    },
-    /*moneyChange () {
+    },*/
+    moneyChange () {
       if (isEmpty(this.charge.f_charge_money) || Number(this.charge.f_charge_money) === 0) {
         this.$showAlert('单笔收费不能为0元！！！', 'warning', 3000)
         this.charge.f_charge_money = null
@@ -457,7 +450,7 @@ export default {
         this.charge.f_charge_money = null
         return
       }
-    },*/
+    },
     // 金额转大写
     handleInput(index) {
       // 通过正则过滤小数点后两位
@@ -525,12 +518,35 @@ export default {
       })
 
     },
+    //查询补充协议金额，并更新
     async showChargeModal() {
+      if(this.selectdata.defname==='报装缴费'){
+        if (this.selectdata.f_apply_type === '团购报建') {
+          this.charge.f_dev_info_id = this.selectdata.f_dev_id
+        }
+        this.getUserAddress()
+        this.charge.f_payment_method = '掌上营业厅'
+        this.showCharge = true
+      }else{
+      let data={
+        f_process_id:this.selectdata.f_process_id
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/logic/getApplyContractSumMoney`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '更新补充金额！！！'}
+      )
+      this.selectdata.f_due_money = res.data + this.selectdata.f_contract_money
+      this.selectdata.f_surplus_money = res.data + this.selectdata.f_contract_money- this.selectdata.f_cumulative_payment_money
+      if (this.selectdata.f_apply_type === '团购报建') {
+        this.charge.f_dev_info_id = this.selectdata.f_dev_id
+      }
       this.getUserAddress()
-
       this.charge.f_payment_method = '掌上营业厅'
-
       this.showCharge = true
+      }
     },
     async search () {
       let http = new HttpResetClass()

package/src/filiale/guangxi/pc/ApplyCharge/chargeManagement.vue

@@ -26,7 +26,7 @@
               type="button"
               class="btn btn-info head-but"
               @click="$parent.$parent.showChargeModal()"
-              :disabled="$parent.$parent.mark === 1 || ($parent.$parent.selectdata.f_cumulative_payment_money >= $parent.$parent.selectdata.f_due_money || $parent.$parent.selectdata.f_surplus_money === 0)"
+              :disabled="$parent.$parent.mark === 1"
             >新增收费</button>
           </th>
         </tr>
@@ -468,6 +468,7 @@ export default {
       this.showPrint = true
     },
     selectAddres () {
+      debugger
       if (this.charge.useraddres) {
         this.charge.f_cumulative_payment_money = this.charge.useraddres.f_cumulative_payment_money
         this.charge.f_outstanding_amount = this.selectdata.f_price - this.charge.useraddres.f_cumulative_payment_money
@@ -475,6 +476,7 @@ export default {
         this.charge.f_cumulative_payment_money = 0
         this.charge.f_outstanding_amount = this.selectdata.f_price
       }
+      debugger
     },
     async invalidApplyCharge() {
 
@@ -506,7 +508,6 @@ export default {
         user: this.$login.f,
         charge: this.charge
       }
-
       let res = await http.load('POST', 'rs/logic/addApplyChargeRecord', {data:data}, {
         resolveMsg: null,
         rejectMsg: '缴费失败！！！'
@@ -601,7 +602,6 @@ export default {
           resolveMsg: null,
           rejectMsg: '开发商档案查询失败！！！'
         })
-
         this.charge.f_payer_name = res.data[0].f_dev_name
         this.charge.f_payer_account = res.data[0].f_bank_account
       }
@@ -626,11 +626,9 @@ export default {
         resolveMsg: null,
         rejectMsg: '用户获取失败！！！'
       })
-
       if (res.data.length <= 0) {
         this.$showAlert('暂无需要缴费用户！！！', 'warning', 3000)
       }
-
       this.useraddresList = res.data.map(item => {
         return {
           // 有用户姓名地址后拼接姓名
@@ -638,18 +636,41 @@ export default {
           value: item
         }
       })
-
     },
     async showChargeModal() {
-      this.getUserAddress()
-
-      if (this.selectdata.f_apply_type === '团购报建') {
-        this.charge.f_dev_info_id = this.selectdata.f_dev_id
+      debugger
+      if(this.selectdata.defname==='报装缴费'){
+        this.getUserAddress()
+        if (this.selectdata.f_apply_type === '团购报建') {
+          this.charge.f_dev_info_id = this.selectdata.f_dev_id
+        }
+        this.showCharge = true
+      }else {
+        //查询补充协议金额，并更新
+        let data = {
+          f_process_id: this.selectdata.f_process_id
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/logic/getApplyContractSumMoney`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '更新补充金额！！！'}
+        )
+        this.selectdata.f_due_money = res.data + this.selectdata.f_contract_money
+        this.selectdata.f_surplus_money = res.data + this.selectdata.f_contract_money- this.selectdata.f_cumulative_payment_money
+        this.getUserAddress()
+        if (this.selectdata.f_apply_type === '团购报建') {
+          this.charge.f_dev_info_id = this.selectdata.f_dev_id
+        }
+        this.selectAddres()
+        this.showCharge = true
+        debugger
       }
-
-      this.showCharge = true
     },
+
     async search () {
+      debugger
       let http = new HttpResetClass()
       let data = {
         // condition: `cr.f_charge_status != '退款'`,
@@ -660,6 +681,7 @@ export default {
         rejectMsg: '收费记录查询失败！！！'
       })
       this.model.data = res.data
+      debugger
     },
     // 关闭对话框
     closeModal() {

package/src/filiale/guangxi/pc/Process/Service/addMaterialScience.vue

@@ -189,6 +189,7 @@
         onetomany: {
           rows: []
         },
+        contractMoney:0,
         title:'新增',
         summoney:0,
         showMaterialModal:false,
@@ -216,7 +217,6 @@
     },
     methods: {
       sumMaterialzong(materials){
-        debugger
         this.summoney=0
         for(var i=0;i<materials.length; i++){
          this.summoney =parseFloat(parseFloat(materials[i].f_material_money)+ parseFloat(this.summoney)).toFixed(2)
@@ -315,8 +315,10 @@
       },
       // 新增材料
       async addMaterial () {
+        debugger
         console.log("登录信息：",this.$login.f)
         this.title = '新增'
+        var mater_Code=this.getProjectNum() + Math.floor(Math.random() * 10000)
         let data = {
           selectdata:this.selectdata,
           f_process_id : this.selectdata.f_process_id,
@@ -326,6 +328,7 @@
           f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
           f_orgid: this.$login.f.orgid,
           f_orgname: this.$login.f.orgs,
+          f_material_code:mater_Code,
           materials:this.materials
         }
         //报警器流程 设备编号检验
@@ -339,33 +342,65 @@
           data
         )
         debugger
-   // if(res.data == 200){
-   //
-   //   // let contractbu={
-   //   //   f_contract_money:money,
-   //   //   f_contract_type:'材料合同'
-   //   // }
-   //   // let data ={
-   //   //   contract:contractbu,
-   //   //   selectdata: this.selectdata,
-   //   //   user: this.$login.f,
-   //   // }
-   //   // let http1 = new HttpResetClass()
-   //   // let res = await http1.load(
-   //   //   'POST',
-   //   //   `rs/logic/saveReplenishContract`,
-   //   //   {data: data},
-   //   //   {resolveMsg: null, rejectMsg: '补充协议成功！！！'}
-   //   // )
-   // }
-        this.closeMaterials()
+        if(res.data == 200){
+          this.contractMoney = 0
+          for(var i=0;i<this.materials.length; i++){
+            this.contractMoney =parseFloat(parseFloat(this.materials[i].f_material_money)+ parseFloat(this.contractMoney)).toFixed(2)
+          }
+          let contractbu={
+            f_process_id :this.selectdata.f_process_id,//项目节点编号
+            f_apply_num : this.selectdata.f_apply_num,  //项目编号
+            f_contract_number:mater_Code,          //协议编号
+            f_contract_type: '材料代购',           //协议类型
+            f_contract_money:this.contractMoney ,           //协议金额
+            f_contract_time:new Date().Format('yyyy-MM-dd HH:mm:ss'),//协议创造时间
+            f_contract_status: '有效',                 //协议是否有效
+            f_remarks :'材料代购',                      //备注
+            f_operator:this.$login.f.name,                //操作人
+            f_date :new Date().Format('yyyy-MM-dd HH:mm:ss'),//操作时间
+            f_department : this.$login.f.f_department_name, //部门
+            f_filiale :this.$login.f.orgs                  //组织名称
+          }
+          let data1 ={
+            contract:contractbu
+          }
+          let http1 = new HttpResetClass()
+          let res = await http1.load(
+            'POST',
+            `rs/logic/NewAddMaterContract`,
+            {data: data1},
+            {resolveMsg: null, rejectMsg: '补充协议成功！！！'}
+          )
+          this.closeMaterials()
+          debugger
+
+        }
+      },
+      getProjectNum () {
+        const projectTime = new Date() // 当前中国标准时间
+        const Year = projectTime.getFullYear() // 获取当前年份 支持IE和火狐浏览器.
+        const Month = projectTime.getMonth() + 1 // 获取中国区月份
+        const Day = projectTime.getDate() // 获取几号
+        var CurrentDate = Year
+        if (Month >= 10) { // 判断月份和几号是否大于10或者小于10
+          CurrentDate += Month
+        } else {
+          CurrentDate += '0' + Month
+        }
+        if (Day >= 10) {
+          CurrentDate += Day
+        } else {
+          CurrentDate += '0' + Day
+        }
+        return CurrentDate
       },
+      //删除材料的同时更新合同或者删除合同
       async deleteMaterial (row) {
+        debugger
         var show1 =  window.confirm('您确定要删除这条记录吗?')
         if(show1 != true){
           this.closeMaterials()
         }else{
-          debugger
           let http = new HttpResetClass()
           let res = await http.load(
             'POST',
@@ -373,9 +408,9 @@
             {data: row},
             {resolveMsg: null, rejectMsg: '材料删除失败！！！'}
           )
+          debugger
           this.closeMaterials()
         }
-
       },
       async updateMaterial (index,row) {
         this.title = '修改'

package/src/main.js

@@ -9,7 +9,7 @@ import {material} from 'material-client'
 import apply from './apply'
 
 all()
-apply('guangxi')
+apply('')
 ldap()
 sale()
 material()