apply-clients 3.5.5-18 → 3.5.5-19

package/package.json

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

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

@@ -195,46 +195,19 @@ export default {
         `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyGetConfigs`,
         {data: datarow},
         {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'})
-     let material = row.data[this.selectdata.f_apply_type]
-     if (!isEmpty(material)&& material.length>0){
-       for (let i = 0; i < material.length; i++){
-         let f_material_name = ''
-         this.newmaterialnameandcode.filter((item)=>{
-           if (item.label == material[i].f_material_name) {
-             f_material_name = item.value
-           }
-         })
-         let materialnameandtype = []
-         for (let j = 0; j < this.newmaterialnameandtype.length; j++){
-           if(this.newmaterialnameandtype[j].parent_id == f_material_name.id){
-             materialnameandtype.push(
-               {
-                 label:this.newmaterialnameandtype[j].name,
-                 value: this.newmaterialnameandtype[j]
-               }
-             )
-           }
-         }
-         let f_typenumber = ''
-         materialnameandtype.filter((item)=>{
-           if (item.label == material[i].f_material_style ){
-             f_typenumber = item.value
-           }
-         })
-         this.material.push({
-           f_material_name: f_material_name,
-           f_typenumber: f_typenumber,
-           unit: f_typenumber.unit,
-           f_material_price: f_typenumber.price,
-           f_typename: f_typenumber.name,
-           material_type: f_material_name.name +f_typenumber.name,
-           f_overlength_unitprice:"0",
-           f_overlength_number:"0",
-           f_discounts_money_detail:"0",
-           f_actual_materials_detail:"0"
-         })
-       }
-     }
+      let material = row.data[this.selectdata.f_apply_type]
+      if (!isEmpty(material)&& material.length>0){
+        for (let i = 0; i < material.length; i++){
+          this.material.push({
+            f_material_name: material[i].f_material_name,
+            f_material_style: material[i].f_material_style,
+            f_overlength_unitprice:"0",
+            f_overlength_number:"0",
+            f_discounts_money_detail:"0",
+            f_actual_materials_detail:"0"
+          })
+        }
+      }
     },
     delete_material(i) {
       console.log('删除项====', i)

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

@@ -111,9 +111,24 @@ export  default {
       this.$emit('delete_material',i)
     }
   },
-  ready(){
-    if ( this.item.f_material_name) {
-      this.changeMaterialName(this.item.f_material_name)
+  ready () {
+    if (this.item.f_material_name && this.item.f_material_style) {
+      let f_material_name = ''
+      this.newmaterialnameandcode.filter((item) => {
+        if (item.label == this.item.f_material_name) {
+          f_material_name = item.value
+        }
+      })
+      this.item.f_material_name = f_material_name
+      this.changeMaterialName(f_material_name)
+      let f_typenumber = ''
+      this.materialnameandtype.filter((item) => {
+        if (item.label == this.item.f_material_style) {
+          f_typenumber = item.value
+        }
+      })
+      this.item.f_typenumber = f_typenumber
+      this.changeType(f_typenumber)
     }
     console.log(this.item)
   }