apply-clients 3.5.5-22 → 3.5.5-23

package/package.json

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

package/src/components/product/Process/Processes/contractModel.vue

@@ -89,7 +89,7 @@
                     style="width: 100%"
                     placeholder="0.00"
                     @blur="handleInput"
-                    v-model="userRecord.f_cost" />
+                    v-model="userRecord.f_cos_amount" />
            </div>
          </div>
          <div class="form-group col-sm-12">
@@ -210,7 +210,7 @@ export default {
         //户数
         f_households: "",
         //费用
-        f_cost: "",
+        f_cos_amount: "",
         //金额大写
         f_amount_capital: "",
         //付款方式
@@ -360,7 +360,7 @@ export default {
         //户数
         f_households: "",
         //费用
-        f_cost: "",
+        f_cos_amount: "",
         //金额大写
         f_amount_capital: "",
         //付款方式

package/src/filiale/jinhuang/android/AppAddMaterialScience.vue

@@ -330,7 +330,8 @@ export default {
         this.meterialOptions = res2.data.map(item => {
           return {
             'label': `${item.name}--${item.spec}--${item.smallnumname}`,
-            'value': item
+            'value': item.code,
+            'materials': item
           }
         })
       }
@@ -358,8 +359,13 @@ export default {
     modifyOtherValue (index){
       console.log("进来了",index)
       console.log("dddd",this.materials[index].material)
-      if(this.materials[index].material){
-        let material = this.materials[index].material
+      let material ={}
+      if(this.materials[index].material[0]){
+        for(let i=0;i<this.meterialOptions.length;i++){
+          if(this.materials[index].material[0]==this.meterialOptions[i].value){
+            material = this.meterialOptions[i].materials
+          }
+        }
         this.materials[index].f_material_price=0
         this.materials[index].f_material_name = material.name
         this.materials[index].f_material_style = material.spec
@@ -378,6 +384,7 @@ export default {
         this.materials[index].f_bjq_sid=''
         this.materials[index].f_userinfo_code = ''
       }
+
     },
     // 新增材料
     async addMaterial() {
@@ -504,7 +511,7 @@ export default {
       let http = new HttpResetClass()
       let res = await http.load(
         'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/applysaveMaterials`,
         data
       )