apply-clients 3.5.5-4 → 3.5.5-41

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

@@ -111,6 +111,58 @@
               </datepicker>
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">计划通气日期：</label>
+            <div class="col-xs-8" >
+              <datepicker id="startDate" placeholder="计划通气开始日期"
+                          style="width: 100%!important;"
+                          v-model="model.jihuastart"
+                          :value.sync="model.jihuastart"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="u.f_reconnaissance_time >= '{}'">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">计划通气日期：</label>
+            <div class="col-xs-8" >
+              <datepicker id="startDate" placeholder="计划通气结束日期"
+                          style="width: 100%!important;"
+                          v-model="model.jihuaend"
+                          :value.sync="model.jihuaend"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="u.f_reconnaissance_time <= '{}'">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">预计通气时间：</label>
+            <div class="col-xs-8" >
+              <datepicker id="startDate" placeholder="预计通气开始时间"
+                          style="width: 100%!important;"
+                          v-model="model.yujistart"
+                          :value.sync="model.yujistart"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="u.f_yjgase_time >= '{}'">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">预计通气时间：</label>
+            <div class="col-xs-8" >
+              <datepicker id="startDate" placeholder="预计通气结束时间"
+                          style="width: 100%!important;"
+                          v-model="model.yujiend"
+                          :value.sync="model.yujiend"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="u.f_yjgase_time <= '{}'">
+              </datepicker>
+            </div>
+          </div>
 <!--          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">稍后处理：</label>
             <div class="col-xs-8" >

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

@@ -183,6 +183,31 @@ export default {
 
   },
   methods: {
+   async getdefaultmaterial() {
+     this.material = []
+      let datarow = {
+        workname: 'materials'
+      }
+      let http = new HttpResetClass()
+      let row = await http.load(
+        'POST',
+        `${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++){
+          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)
       this.material.splice(i, 1)
@@ -269,6 +294,7 @@ export default {
         }
         // 所有型号
         this.newmaterialnameandtype =materialNumbers
+        this.getdefaultmaterial()
       }).catch((e) => {
         console.log("933", e)
       })
@@ -637,7 +663,10 @@ export default {
         this.material.forEach((row) => {
           if (row.f_material_price != 0) {
             if(row.f_material_name.name=="自闭阀"){
-              str="自闭阀"
+              str=this.$appdata.getSingleValue(`报建自闭阀收费类型`)
+            }
+            if(row.f_material_name.name=="燃具管(连接管)"){
+              str=this.$appdata.getSingleValue(`报建燃具管收费类型`)
             }
             otherdetail.push({
               f_brand_spec: [`${str}`],