apply-clients 3.5.4-98 → 3.5.5-1

package/package.json

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

package/src/filiale/baiyin/android/ByAddMaterialScience.vue

@@ -7,7 +7,6 @@
             <template partial='head'>
               <tr>
                 <th>序号</th>
-                <th>安装</th>
                 <th>材料名称</th>
                 <th>规格、型号</th>
                 <th>单位</th>
@@ -22,7 +21,6 @@
             </template>
             <template partial='body'>
               <td >{{$index+1}}</td>
-              <td >{{row.f_material_install}}</td>
               <td>{{row.f_material_name}}</td>
               <td >{{row.f_material_model}}</td>
               <td >{{row.f_unit}}</td>
@@ -45,12 +43,18 @@
       <header slot="modal-header" class="modal-header">
         <button type="button" class="close" @click="addclose"><span>&times;</span></button>
         <h4 class="modal-title">添加材料</h4>
-      </header>
-      <article slot="modal-body" class="modal-body">
         <div class="from-group">
-          <label>安装</label>
-          <input type="text" class="form-control" v-model="selectItem.f_material_install">
+          <label style="color: red">材料类型</label>
+          <input-select
+
+            :value.sync="selectItem.f_material_style"
+            v-model="selectItem.f_material_style"
+            :options="materialstyle"
+            @change="materialStyleChange"
+          ></input-select>
         </div>
+      </header>
+      <article slot="modal-body" class="modal-body">
         <div class="from-group">
           <label>材料名称</label>
           <input-select
@@ -70,7 +74,7 @@
         </div>
         <div class="from-group">
           <label>单位</label>
-          <input type="text" class="form-control" v-model="selectItem.f_unit">
+          <input type="text" class="form-control"  :value.sync="selectItem.f_unit"  v-model="selectItem.f_unit">
         </div>
         <div class="from-group">
           <label>数量</label>
@@ -110,13 +114,9 @@
             :options="materialModel"
           ></input-select>
         </div>
-        <div class="from-group">
-          <label>安装</label>
-          <input type="text" class="form-control" v-model="selectItem.f_material_install">
-        </div>
         <div class="from-group">
           <label>单位</label>
-          <input type="text" class="form-control" v-model="selectItem.f_unit">
+          <input type="text" class="form-control" :value.sync="selectItem.f_unit"  v-model="selectItem.f_unit">
         </div>
         <div class="from-group">
           <label>材料数量</label>
@@ -319,7 +319,9 @@ export default {
       fmaterialprice: [],
       params: null,
       record: {},
-      selectItem: {},
+      selectItem: {
+        f_unit:''
+      },
       isbuttonshow: true,
       model: {
         rows: []
@@ -354,7 +356,8 @@ export default {
       headData: ["安装","材料名称","规格、型号","单位","数量","备注"],
       bodyData: ["f_material_install", "f_material_name", "f_material_model","f_unit","f_amount","f_material_remarks"],
       footinfo: ["主管领导","领料人"],
-      materialNname:this.$appdata.getParam('报建材料'),
+      materialstyle:this.$appdata.getParam('报建材料类型'),
+      materialNname:[],
       materialModel:[]
     }
   },
@@ -368,9 +371,40 @@ export default {
 
   },
   methods: {
+    materialStyleChange() {
+      this.materialNname = [];
+      let s = this.$appdata.getParam(`${this.selectItem.f_material_style}`);
+      if (Array.isArray(s)) {
+        s.forEach(item => {
+          if (item.label && item.value) {
+            const labelParts = item.label.split('-');
+            const valueParts = item.value.split('-');
+            // 假设你希望将拆分后的部分存储在一个新的对象中
+            const newItem = {
+              label: labelParts[0],
+              value: valueParts[0]
+            };
+            // 将新的对象添加到 materialNname 数组中
+            this.materialNname.push(newItem);
+          }
+        });
+      }
+    },
     materialNameChange(){
       this.materialModel = []
       this.materialModel=this.$appdata.getParam(`${this.selectItem.f_material_name}规格型号`)
+      //获取材料单位
+      let s = this.$appdata.getParam(`${this.selectItem.f_material_style}`);
+      if (Array.isArray(s)) {
+        s.forEach(item => {
+          if (item.label && item.value) {
+            const labelParts = item.label.split('-');
+            if (labelParts[0] === this.selectItem.f_material_name) {
+              this.selectItem.f_unit=labelParts[1]
+            }
+          }
+        });
+      }
     },
     async searchByName(){
       console.log('搜索材料名车')

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

@@ -1453,27 +1453,18 @@ export default {
           let f_xingzheng = this.getLableValue('片区/行政村') || ''
           let f_residential_area = this.getLableValue('集收单位')?this.getLableValue('集收单位'):this.getLableValue('小区') || ''
           let f_building = this.getLableValue('楼号/组') || ''
-          let f_building_suffix = f_building ? this.config.f_building_suffix : ''
+          // let f_building_suffix = f_building ? this.config.f_building_suffix : ''
+          let f_building_suffix = f_building ? '号楼' : ''
           let f_unit = this.getLableValue('单元/排') || ''
-          let f_unit_suffix = f_unit ? this.config.f_unit_suffix : ''
+          // let f_unit_suffix = f_unit ? this.config.f_unit_suffix : ''
+          let f_unit_suffix = f_unit ? '单元' : ''
           let f_floor = this.getLableValue('楼层') || ''
-          let f_floor_suffix = f_floor ? this.config.f_floor_suffix : ''
+          // let f_floor_suffix = f_floor ? this.config.f_floor_suffix : ''
+          let f_floor_suffix = f_floor ? '层' : ''
           let f_room = this.getLableValue('门牌号') || ''
-          let f_room_suffix = f_room ? this.config.f_room_suffix : ''
-
-          let f_address = null
-
-          let f_address_type = this.show_data.f_address_type
-          f_address = f_pcd + f_street +f_xingzheng+ f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
-          /*if (f_address_type === '民用城区') {
-            f_address = f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
-          }
-          if (f_address_type === '民用农村') {
-            f_address = f_building + f_unit + f_floor + f_room
-          }
-          if (f_address_type === '特殊城区') {
-            f_address = f_street + f_residential_area
-          }*/
+          // let f_room_suffix = f_room ? this.config.f_room_suffix : ''
+          let f_room_suffix = f_room ? '室' : ''
+          let f_address = f_pcd + f_street +f_xingzheng+ f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
           this.setLabelValue("地址", f_address)
         }
       }