apply-clients 4.1.30-weinan → 4.1.32-weinan

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.30-weinan",
+  "version": "4.1.32-weinan",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/app_apply/AppChargeManagement.vue

@@ -106,7 +106,7 @@
           </div>
         </div>
         <div v-for="(index,payment) in charge.payment_terms">
-          <div class="form-group row vertical-center" :class="payment.f_payment_term ? '':'has-error'">
+<!--          <div class="form-group row vertical-center" :class="payment.f_payment_term ? '':'has-error'">
             <label class="col-xs-4 control-label">收费项目：</label>
             <div class="col-xs-8">
               <input-select class="select select_list"
@@ -116,7 +116,7 @@
                             :value-single="true"
                             close-on-select ></input-select>
             </div>
-          </div>
+          </div>-->
           <div class="form-group row vertical-center" :class="payment.f_charge_money ? '':'has-error'">
             <label class="col-xs-4 control-label">收费金额：</label>
             <div class="col-xs-8">
@@ -264,6 +264,7 @@ export default {
         this.timeLeft = 300
         // 修改支付状态
         this.updatestate('支付成功','有效')
+        this.saveother()
         // 清除二维码
         this.clearQrCode()
         this.showQrCode = false
@@ -317,6 +318,7 @@ export default {
           console.log(res.data)
           if (res.data.code == '200'){
             this.$showMessage('缴费成功！')
+            this.saveother()
             this.showCharge=false
             return
           }else {
@@ -587,7 +589,67 @@ export default {
         resolveMsg: null,
         rejectMsg: '关闭失败！！！'
       })
-    }
+    },
+   async saveother(){
+     let http = new HttpResetClass()
+      let data = {
+        condition: " 1=1",
+        f_process_id: this.selectdata.f_process_id
+      }
+      let res = await http.load('POST', this.$androidUtil.getProxyUrl() +'/rs/sql/getAddresAndUserinfoAndUserfilesAmount', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+     let data1 = {
+       tablename: 't_material_charges',
+       condition: `f_process_id = '${this.selectdata.f_process_id}'`
+     }
+     let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data1}, {resolveMsg: null, rejectMsg: '获取数据失败'})
+
+     let otherdetails = []
+       for(let i=0;i<res1.data.length;i++){
+          otherdetails.push(
+            {
+              "f_brand_spec":[res1.data[i].f_material_name],
+              "f_unitprice":res1.data[i].f_material_price,
+              "f_typename":[res1.data[i].f_typename],
+              "f_typenumber":[res1.data[i].f_typenumber],
+              "f_number":res1.data[i].f_material_number
+            }
+          )
+       }
+     console.log("查询的用户信息",otherdetails)
+      let data2 = {
+        "record_userinfo":res.data[0].f_userinfo_id,
+        "f_userfiles_id":res.data[0].f_userfiles_id,
+        "f_user_id":res.data[0].f_user_id,
+        "f_user_name":res.data[0].f_user_name,
+        "f_address":res.data[0].f_address,
+        "f_user_type":this.selectdata.f_user_type,
+        "f_gasproperties":"",
+        "f_collection":this.selectdata.f_cost_sum,
+        "f_comments":"",
+        "f_payment":this.charge.f_payment_method,
+        "f_voucher_number":"",
+        "f_bill_style":"普通收据",
+        "f_userinfo_id":res.data[0].f_userinfo_id,
+        "f_service_person":Vue.user.name,
+        "f_operat_type":"其他收费",
+        "f_describe":"",
+        "f_state":"有效",
+        "f_operator":Vue.user.name,
+        "f_operatorid":Vue.user.id,
+        "f_orgid":Vue.user.orgid,
+        "f_orgname":Vue.user.orgs,
+        "f_depid":Vue.user.depids,
+        "f_depname":Vue.user.f_department_name,
+        "t_userfees":"",
+        "f_fee_type":"其他费用",
+        "f_fee_time":"12",
+        "otherdetail":otherdetails
+     }
+     let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/sale_othercharge_logic`, {data: data2}, {resolveMsg: null, rejectMsg: '保存数据失败'})
+   }
     // async getConfig () {
     //   let http = new HttpResetClass()
     //   let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getWeiXinConfig`, null, {

package/src/components/app_apply/AppInstallationDetails.vue

@@ -211,7 +211,7 @@
                 :valueSingle="true"></input-select>
             </div>
           </div>-->
-          <div class="form-group col-sm-6">
+          <div class="form-group col-sm-6" :class="[$v.f_install_date.required ? 'has-error' : '']">
             <label class="col-sm-4 control-label">安装日期：</label>
             <div class="col-sm-8">
               <datepicker
@@ -220,6 +220,7 @@
                 v-model="item.f_install_date"
                 format="yyyy-MM-dd HH:mm:ss"
                 :disabled="mark === 1"
+                v-validate:f_install_date = "['required']"
                 :show-reset-button="reset">
               </datepicker>
             </div>

package/src/components/app_apply/AppdevicesDetails.vue

@@ -211,6 +211,7 @@
                      type="number"
                      placeholder="使用年限"
                      v-model="item.f_service_life"
+                     @change="outdate(item)"
                      :value="item.f_service_life"
                      :readonly="mark === 1"/>
             </div>
@@ -633,6 +634,7 @@ export default {
         rejectMsg: '设备添加失败！！！'
       })
       this.showUserFile = false
+      this.search()
     },
     // 打开设备明细
     async showUserFileModal (row) {
@@ -772,6 +774,22 @@ export default {
       this.query = {}
       this.condition = "1 = 1"
     },
+    outdate(item){
+      console.log("数据",item)
+      debugger
+      if (item.f_make_date){
+        debugger
+        var t = new Date(item.f_make_date);//你已知的时间
+        var Y = t.getFullYear()+parseInt(item.f_service_life)+ '-'
+        var M = (t.getMonth()+1 < 10 ? '0'+(t.getMonth()+1):t.getMonth()+1) + '-'
+        var D = (t.getDate()< 10 ? '0'+t.getDate():t.getDate())+ ' '
+        var h = (t.getHours() < 10 ? '0'+t.getHours():t.getHours())+ ':'
+        var m = (t.getMinutes() < 10 ? '0'+t.getMinutes():t.getMinutes())+ ':'
+        var s = t.getSeconds() < 10 ? '0'+t.getSeconds():t.getSeconds()
+        item.f_expire_date = Y+M+D+h+m+s
+      }
+
+    }
   },
   events: {
     async 'onFileUpload'(file, result) {

package/src/components/app_apply/ServiceControl.vue

@@ -274,7 +274,13 @@
       },
       // 任意select选中时触发事件
       'select_cascade'(index){
-        console.log("sihoennoojooinoi",this.selectdata.f_stair_price_name,this.$refs.service_show.data)
+        if (this.data.fields[index].label === '是否具备安装条件'&& this.show_data.fields[index].value === '否') {
+          this.show_data.fields[index+9].required = false
+          this.show_data.fields[index+10].required = false
+          this.show_data.fields[index+11].required = false
+          this.show_data.fields[index+12].required = false
+          this.show_data.fields[index+13].required = false
+        }
         // this.$refs.service_show.model_temp // 子业务显示组件
         // 级联操作示例：
         /*
@@ -317,14 +323,14 @@
         model=Object.assign({},this.selectdata,model)
         console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
         let http = new HttpResetClass()
-        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装') && model.f_is_have == '否'&& model. model.button.button_name == '提交'){
+        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装') && model.f_is_have == '否'&& model.button.button_name == '提交'){
           let model1 ={
             f_stop_remarks : '不具备安装条件'
           }
           this.stopapply(model1,model)
           return
         }
-        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装')  && model.f_is_aerate == '否' && model. model.button.button_name == '提交'){
+        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装')  && model.f_is_aerate == '否' && model.button.button_name == '提交'){
           let model1 ={
             f_stop_remarks : '未通气'
           }

package/src/components/app_apply/materialshoufei.vue

@@ -43,7 +43,32 @@
     <article slot="modal-body" class="modal-body">
       <div class="from-group">
         <label>材料名称</label>
-        <input type="text" class="form-control" v-model="addItem.f_material_name">
+        <input-select
+          class="select select_list"
+          :value.sync="addItem.f_material_name"
+           v-model="addItem.f_material_name"
+          :options="positions"
+          @change="setTypename"
+          :valueSingle="true"></input-select>
+      </div>
+      <div class="from-group">
+        <label>品名规格</label>
+        <input-select
+          class="select select_list"
+          :value.sync="addItem.f_typename"
+          v-model="addItem.f_typename"
+          :options="typeNameList"
+          @change="setTypenumber"
+          :valueSingle="true"></input-select>
+      </div>
+      <div class="from-group">
+        <label>型号</label>
+        <input-select
+          class="select select_list"
+          :value.sync="addItem.f_typenumber"
+          v-model="addItem.f_typenumber"
+          :options="typeNumberList"
+          :valueSingle="true"></input-select>
       </div>
       <div class="from-group">
         <label>单价(元)</label>
@@ -84,6 +109,9 @@ export default {
       },
       addItem: {},
       f_cost_sum: 0,
+      positions:this.$appdata.getParam('品名及规格'),
+      typeNameList:null,
+      typeNumberList:null
     }
   },
   props: {
@@ -153,6 +181,12 @@ export default {
     smalltoBIG() {
       let num =  Number(this.addItem.f_material_price) *  Number(this.addItem.f_material_number)
       return num
+    },
+     setTypename (val) {
+      this.typeNameList = this.$appdata.getParam(val)
+    },
+    setTypenumber (val) {
+      this.typeNumberList = this.$appdata.getParam(val)
     }
   },
   watch: {}