telephone-clients 3.0.86 → 3.0.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.86",
+  "version": "3.0.88",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {

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

@@ -279,6 +279,7 @@ getallfee(){
         unit:"",
         f_material_price:"",
         f_typenumber:"",
+        f_typename:""
       })
     },
     getmaterialTYPE(){
@@ -522,6 +523,7 @@ getallfee(){
       }
       for (let i = 0; i < this.material.length; i++) {
         this.material[i].f_process_id = this.selectdata.f_process_id
+        this.material[i].f_fee = this.material[i].f_material_price * this.material[i].f_material_number
         if (isEmpty(this.material[i].f_state)) {
           this.material[i].f_state = '未收费'
         }
@@ -531,6 +533,7 @@ getallfee(){
         imgs: imgs,
         f_process_id: this.selectdata.f_process_id
       }
+      console.log("要保存了666",data)
       HostApp.__this__ = this
       HostApp.logicWithHint({
         // logic别名，key必须为logic

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

@@ -36,7 +36,7 @@
       <label>单价(元/{{ item.unit }})</label>
       <input type="number" class="form-control y-form-item-input"
              v-model="item.f_material_price"
-             readonly
+
              >
     </div>
     <div class="y-form-item">
@@ -65,6 +65,7 @@ export  default {
           this.item.f_typenumber = res['value']['materialNumber'].name
           this.item.unit = res['value']['materialNumber'].unit
           this.item.f_material_price = res['value']['materialNumber'].price
+          this.item.f_typename = res['value']['typeName'].name
         }
 
       }

package/src/filiale/qianneng/android/PhoneStandWork.vue

@@ -229,7 +229,7 @@
       showback(val){
         this.sendBackData = {
           f_processid:val.f_processid,
-          id:val.id_back,
+          id:val.id,
           serviceacitivity:[{f_site_back_reason:''}]
         }
         this.backshow = true

package/src/filiale/qianneng/pc/MaterialDetailed.vue

@@ -197,7 +197,7 @@ export default {
       })
     },
     searchCondition (args) {
-      args.condition = args.condition + ` and sw.f_orgid = '${this.$login.f.orgid}'`
+      args.condition = args.condition + ` and sw.f_filiale_id = '${this.$login.f.orgid}'`
       this.model.search(args.condition, args.model)
     },
     // 查询