apply-clients 4.1.34-weinan → 4.1.36-weinan

package/package.json

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

package/src/components/app_apply/AppChargeManagement.vue

@@ -526,6 +526,20 @@ export default {
 
     },
     async showChargeModal() {
+      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
+      })
+      if (res.data[0].f_user_id===null){
+        debugger
+        this.$showMessage("请先添加表具信息！！！")
+        return
+      }
       this.getUserAddress()
       console.log("材料费",this.selectdata.f_cost_sum)
       this.charge.payment_terms[0].f_charge_money =  this.selectdata.f_cost_sum

package/src/components/app_apply/materialshoufei.vue

@@ -68,6 +68,7 @@
           :value.sync="addItem.f_typenumber"
           v-model="addItem.f_typenumber"
           :options="typeNumberList"
+          @change="setmaterialprice"
           :valueSingle="true"></input-select>
       </div>
       <div class="from-group">
@@ -107,7 +108,9 @@ export default {
       model: {
         rows: [] // 材料收费数据数组
       },
-      addItem: {},
+      addItem: {
+        f_material_price:0
+      },
       f_cost_sum: 0,
       positions:this.$appdata.getParam('品名及规格'),
       typeNameList:null,
@@ -187,6 +190,10 @@ export default {
     },
     setTypenumber (val) {
       this.typeNumberList = this.$appdata.getParam(val)
+    },
+    setmaterialprice(val){
+      debugger
+      this.addItem.f_material_price = this.$appdata.getSingleValue(val)
     }
   },
   watch: {}