apply-clients 3.5.5-3 → 3.5.5-31

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

@@ -1296,9 +1296,6 @@ export default {
           if (res.data.length == 0){
             http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,{data: {condition:` f_process_id= '${this.show_data.f_parent_process_id}'`, data: {id: Vue.user.id,orgid: Vue.user.orgid}}},{resolveMsg:null,rejectMsg:null}).then(row=>{
               const show_data = row.data[0]
-              if(this.show_data.f_apply_type === '工程施工' && this.show_data.f_budget_people == '博德蚁穴阳春公司' && !isEmpty(this.show_data.f_construction_remarks)){
-                show_data.f_construction_remarks = show_data.f_construction_remarks +''+this.show_data.f_construction_remarks
-              }
               show_data.user = Vue.user
               show_data.start_activity ='报装申请'
               show_data.xmlfilename = show_data.f_apply_type

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

@@ -1,156 +1,176 @@
-<template>
-  <div class="y-form" style="border-bottom: 1px dashed grey;">
-    <div class="y-form-head">
-      <span style="text-align: center;font-weight: bolder;">材料{{ index + 1 }}信息</span>
-      <button
-        style="float: right"
-        class="button_delete button_spacing"
-        @click.prevent="deleteUserFile(index)"
-      >删除
-      </button>
-    </div>
-    <div class="y-form-item">
-      <label>材料名称</label>
-      <v-select
-        :width="'70%'"
-        :value.sync="item.f_material_name"
-        v-model="item.f_material_name"
-        :options='newmaterialnameandcode'
-        placeholder='请选择'
-        close-on-select
-        :value-single="true"
-        @change="changeMaterialName"
-      ></v-select>
-    </div>
-    <div class="y-form-item">
-      <label>型号</label>
-      <v-select
-        :width="'70%'"
-        :value.sync="item.f_typenumber"
-        v-model="item.f_typenumber"
-        :options='materialnameandtype'
-        placeholder='请选择'
-        close-on-select
-        @change="changeType"
-        :value-single="true"
-      ></v-select>
-    </div>
-    <div class="y-form-item">
-      <label>单价(元/{{ item.unit }})</label>
-      <input type="number" class="form-control y-form-item-input"
-             v-model="item.f_material_price"
-             @change="material_number_chenge"
-      >
-    </div>
-    <div class="y-form-item">
-      <label>数量</label>
-      <input type="number" class="form-control y-form-item-input" v-model="item.f_material_number"    @change="material_number_chenge"
-             :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
-    </div>
-    <div class="y-form-item">
-      <label>超支单价</label>
-      <input type="number" class="form-control y-form-item-input" v-model="item.f_overlength_unitprice" @change="material_number_chenge"
-             :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
-    </div>
-    <div class="y-form-item">
-      <label>超支数量</label>
-      <input type="number" class="form-control y-form-item-input" v-model="item.f_overlength_number" @change="material_number_chenge"
-             :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
-    </div>
-    <div class="y-form-item">
-      <label>优惠金额</label>
-      <input type="number" class="form-control y-form-item-input" v-model="item.f_discounts_money_detail" @change="material_number_chenge"
-             :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
-    </div>
-    <div class="y-form-item">
-      <label>材料实际耗材</label>
-      <input type="number" class="form-control y-form-item-input" v-model="item.f_actual_materials_detail"
-             :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
-    </div>
-  </div>
-</template>
-<script>
-export  default {
-  props:["index",'item','materialnameandcode','typenumbers','newmaterialnameandcode','newmaterialnameandtype'],
-  data(){
-    return {
-      materialtypenumber:[],
-      materialnameandtype:[],
-    }
-  },
-  methods:{
-    changeMaterialName(val){
-      this.materialnameandtype=[]
-      console.log(val)
-      if(val){
-        for (let i = 0; i < this.newmaterialnameandtype.length; i++){
-
-          if(this.newmaterialnameandtype[i].parent_id == val.id){
-            this.materialnameandtype.push(
-              {
-                label:this.newmaterialnameandtype[i].name,
-                value: this.newmaterialnameandtype[i]
-              }
-            )
-          }
-        }
-      }
-    },
-    changeType(val){
-      this.item.unit =val.unit
-      this.item.f_material_price =val.price
-      this.item.f_typename =val.name
-      this.item.material_type = this.item.f_material_name.name+val.name
-    },
-    material_number_chenge(){
-      this.$emit('number_chenge')
-    },
-    deleteUserFile(i){
-      this.$emit('delete_material',i)
-    }
-  },
-  ready(){
-    console.log(this.item)
-  }
-}
-</script>
-<style lang="less">
-.y-form {
-  display: flex;
-  flex-flow: column;
-  gap: 10px;
-  padding: 10px 5px;
-  .y-form-head {
-    background-color: #e8f4ff;
-    display: flex;
-    padding: 10px 20px;
-    align-items: center;
-    justify-content: space-between;
-  }
-
-  .y-form-item {
-    display: flex;
-    gap: 10px;
-    margin-top: 3px;
-    label {
-      width: 30%;
-      margin-bottom: 0;
-      display: flex;
-      flex-direction: row-reverse;
-      align-items: center;
-    }
-    .lab_sty{
-      margin-bottom: 0;
-      display: flex;
-      flex-direction: row-reverse;
-      align-items: center;
-    }
-
-    .y-form-item-input {
-      width: 70%;
-    }
-  }
-
-}
-
-</style>
+<template>
+  <div class="y-form" style="border-bottom: 1px dashed grey;">
+    <div class="y-form-head">
+      <span style="text-align: center;font-weight: bolder;">材料{{ index + 1 }}信息</span>
+      <button
+        style="float: right"
+        class="button_delete button_spacing"
+        @click.prevent="deleteUserFile(index)"
+      >删除
+      </button>
+    </div>
+    <div class="y-form-item">
+      <label>材料名称</label>
+      <v-select
+        :width="'70%'"
+        :value.sync="item.f_material_name"
+        v-model="item.f_material_name"
+        :options='newmaterialnameandcode'
+        placeholder='请选择'
+        close-on-select
+        :value-single="true"
+        @change="changeMaterialName"
+      ></v-select>
+    </div>
+    <div class="y-form-item">
+      <label>型号</label>
+      <v-select
+        :width="'70%'"
+        :value.sync="item.f_typenumber"
+        v-model="item.f_typenumber"
+        :options='materialnameandtype'
+        placeholder='请选择'
+        close-on-select
+        @change="changeType"
+        :value-single="true"
+      ></v-select>
+    </div>
+    <div class="y-form-item">
+      <label>单价(元/{{ item.unit }})</label>
+      <input type="number" class="form-control y-form-item-input"
+             v-model="item.f_material_price"
+             @change="material_number_chenge"
+      >
+    </div>
+    <div class="y-form-item">
+      <label>数量</label>
+      <input type="number" class="form-control y-form-item-input" v-model="item.f_material_number"    @change="material_number_chenge"
+             :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
+    </div>
+    <div class="y-form-item">
+      <label>超支单价</label>
+      <input type="number" class="form-control y-form-item-input" v-model="item.f_overlength_unitprice" @change="material_number_chenge"
+             :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
+    </div>
+    <div class="y-form-item">
+      <label>超支数量</label>
+      <input type="number" class="form-control y-form-item-input" v-model="item.f_overlength_number" @change="material_number_chenge"
+             :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
+    </div>
+    <div class="y-form-item">
+      <label>优惠金额</label>
+      <input type="number" class="form-control y-form-item-input" v-model="item.f_discounts_money_detail" @change="material_number_chenge"
+             :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
+    </div>
+    <div class="y-form-item">
+      <label>材料实际耗材</label>
+      <input type="number" class="form-control y-form-item-input" v-model="item.f_actual_materials_detail"
+             :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
+    </div>
+  </div>
+</template>
+<script>
+import {isEmpty} from "../../../components/Util";
+
+export  default {
+  props:["index",'item','materialnameandcode','typenumbers','newmaterialnameandcode','newmaterialnameandtype'],
+  data(){
+    return {
+      materialtypenumber:[],
+      materialnameandtype:[],
+    }
+  },
+  methods:{
+    changeMaterialName(val){
+      this.materialnameandtype=[]
+      console.log(val)
+      if(val){
+        for (let i = 0; i < this.newmaterialnameandtype.length; i++){
+
+          if(this.newmaterialnameandtype[i].parent_id == val.id){
+            this.materialnameandtype.push(
+              {
+                label:this.newmaterialnameandtype[i].name,
+                value: this.newmaterialnameandtype[i]
+              }
+            )
+          }
+        }
+      }
+    },
+    changeType(val){
+      this.item.unit =val.unit
+      this.item.f_material_price =val.price
+      this.item.f_typename =val.name
+      this.item.material_type = this.item.f_material_name.name+val.name
+    },
+    material_number_chenge(){
+      this.$emit('number_chenge')
+    },
+    deleteUserFile(i){
+      this.$emit('delete_material',i)
+    }
+  },
+  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)
+  }
+}
+</script>
+<style lang="less">
+.y-form {
+  display: flex;
+  flex-flow: column;
+  gap: 10px;
+  padding: 10px 5px;
+  .y-form-head {
+    background-color: #e8f4ff;
+    display: flex;
+    padding: 10px 20px;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .y-form-item {
+    display: flex;
+    gap: 10px;
+    margin-top: 3px;
+    label {
+      width: 30%;
+      margin-bottom: 0;
+      display: flex;
+      flex-direction: row-reverse;
+      align-items: center;
+    }
+    .lab_sty{
+      margin-bottom: 0;
+      display: flex;
+      flex-direction: row-reverse;
+      align-items: center;
+    }
+
+    .y-form-item-input {
+      width: 70%;
+    }
+  }
+
+}
+
+</style>