apply-clients 3.3.81 → 3.3.83

package/src/components/product/Onetomany.vue

@@ -209,12 +209,54 @@ export default {
   ready () {
   },
   methods: {
-    confirmModal () {
+    async confirmModal () {
       if (this.modelTitle === '新增') {
-        if (this.onetomany.add.event) {
-          this.$dispatch(this.onetomany.add.event, this.index)
-        } else {
-          this.$dispatch('onetomanyadd', this.index)
+        //报警器设备型号校验
+        if (this.modelTitle === '新增' && this.selectdata.f_apply_type === '报警器报建'){
+          let data = {
+            f_material_name : "",
+            f_bjq_sid: "",
+          }
+          this.onetomany.fields.forEach(item=>{
+            if (item.label === '材料编号'){
+              data.f_bjq_sid = item.value
+            }
+            if (item.label === '材料名称'){
+              data.f_material_name = item.value
+            }
+          })
+          if (data.f_material_name.substr(0,3) === '报警器'){
+            let res = await this.$resetpost(
+              `ncc/rs/logic/bjqcheck`,
+              // `/rs/logic/bjqcheck`,
+              data
+            )
+            if (res.data.code == 200){
+              if (this.onetomany.add.event) {
+                this.$dispatch(this.onetomany.add.event, this.index)
+              } else {
+                this.$dispatch('onetomanyadd', this.index)
+              }
+              this.closeModal()
+            }else {
+              this.disableButton = true
+              this.$showMessage(res.data.msg)
+            }
+          }else {
+            if (this.onetomany.add.event) {
+              this.$dispatch(this.onetomany.add.event, this.index)
+            } else {
+              this.$dispatch('onetomanyadd', this.index)
+            }
+            this.closeModal()
+          }
+        }else {
+          if (this.onetomany.add.event) {
+            this.$dispatch(this.onetomany.add.event, this.index)
+          } else {
+            this.$dispatch('onetomanyadd', this.index)
+          }
+          this.closeModal()
         }
       }
       if (this.modelTitle === '修改') {
@@ -223,9 +265,9 @@ export default {
         } else {
           this.$dispatch('onetomanyupdate', this.index, this.rowIndex)
         }
+        this.closeModal()
       }
-
-      this.closeModal()
+      // this.closeModal()
     },
     onchange (fieldIndex) {
       this.disableModalButton()

package/src/components/product/Print/BuildOrder/buildOrderList.vue

@@ -18,7 +18,7 @@
                 <label class="font_normal_body">工程编号：</label>
                 <input type="text" style="width: 60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
                        v-on:keyup.enter="$parent.$parent.search()"
-                       condition="f_apply_num = '{}'">
+                       condition="u.f_apply_num = '{}'">
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">客户名称：</label>
@@ -96,13 +96,13 @@
           </template>
           <template partial='body'>
             <tr >
-              <td style="text-align: center;">
+              <td v-if="row.f_back_reason ? showRow: !showRow" style="text-align: center;">
                 <nobr><font>{{$index+1}}</font></nobr>
               </td>
               <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
                 <nobr><font>{{row.f_apply_num}}</font></nobr>
               </td>
-              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+              <td v-if="row.f_back_reason ? showRow: !showRow" style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
                 <nobr><font>{{row.f_user_name}}</font></nobr>
               </td>
               <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
@@ -167,7 +167,8 @@ export default {
       showPrint: false,
       showProgress: false,
       percent: 0,
-      type: 'PREVIEW'
+      type: 'PREVIEW',
+      showRow:false
     }
   },
   ready () {
@@ -213,6 +214,8 @@ export default {
       this.selectdata = null
     },
     async click (row) {
+      console.log("词条数据",row)
+
       this.type = 'PREVIEW'
 
       await this.getData(row)
@@ -233,6 +236,7 @@ export default {
       })
 
       this.selectdata = res.data[0]
+      console.log("打印数据 ",this.selectdata)
     },
     clear () {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {

package/src/components/product/Print/BuildOrder/printBuildOrder.vue

@@ -73,6 +73,10 @@
         <td>备&emsp;&emsp;注</td>
         <td colspan="5">{{ selectdata.f_construction_remarks }}</td>
       </tr>
+      <tr>
+        <td>报建备注</td>
+        <td colspan="5">{{ selectdata.f_apply_remarks }}</td>
+      </tr>
     </table>
   </div>
 

package/src/components/product/Process/ExplorationSelect.vue

@@ -4,6 +4,11 @@
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户名称：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">组织机构：</label>
                 <res-select
@@ -13,12 +18,12 @@
                   is-mul="false"
                 ></res-select>
               </div>
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">工程编号：</label>
-                <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="u.f_apply_num = '{}'">
-              </div>
+<!--              <div class="form-group col-sm-3">-->
+<!--                <label class="font_normal_body">工程编号：</label>-->
+<!--                <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"-->
+<!--                       v-on:keyup.enter="$parent.$parent.search()"-->
+<!--                       condition="u.f_apply_num = '{}'">-->
+<!--              </div>-->
               <div class="form-group col-sm-3 button-range">
                 <a type="button" class="button_new button_spacing" v-if="$parent.$parent.projectStart"
                    href="/apply/download/excel/散户报装模板.xlsx" download>模板下载</a>
@@ -40,10 +45,16 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
+<!--              <div class="form-group col-sm-3">-->
+<!--                <label class="font_normal_body">客户名称：</label>-->
+<!--                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"-->
+<!--                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>-->
+<!--              </div>-->
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">客户名称：</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+                <label class="font_normal_body">工程编号：</label>
+                <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="u.f_apply_num = '{}'">
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">联系电话：</label>
@@ -160,41 +171,41 @@
           </tr>
         </template>
         <template partial='body'>
-          <tr >
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+          <tr class="back-style">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':'', row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{$index+1}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_user_name}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_phone}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_address}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_source}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.defname}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_sub_state}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_date}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <dropdown>
                 <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
                   <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
@@ -449,7 +460,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
   }
 </script>
 <style scoped>
-
+  .back-style{
+    background-color: #ffa726;
+  }
   .p1 {
     color: #dc0b12;
     font-weight:bold

package/src/components/product/Process/Service/ServiceControl.vue

@@ -1208,12 +1208,74 @@ export default {
       this.show_data.start_activity = this.$workflow_vue.start_activity
       this.show_data.xmlfilename = this.$workflow_vue.workflow_xmlfilename
 
+      if (this.show_data.f_apply_type === '报警器报建' && this.show_data.defname === '工程施工' && this.show_data.f_sub_state !='完工'){
+        //判断是否添加报警器材料
+        let bjqlag = false
+        let datatemp = {
+          'bjqid':"",
+          'fprocessid':"",
+          'sqvalue':"",
+          'f_bjq_sid':"",
+          'f_material_code':""
+        }
+        let numOne = [];
+        this.show_data.onetomany.forEach(item=>{
+          item.rows.forEach(i=>{
+            if (i.f_material_name.substr(0,3) === '报警器'){
+              bjqlag = true
+              datatemp.bjqid = i.id
+              datatemp.fprocessid = i.f_process_id
+              datatemp.f_bjq_sid = i.f_bjq_sid
+              datatemp.f_material_code = i.f_material_code
+              numOne.push(i.f_bjq_sid)
+            }
+          })
+        })
+        if (!bjqlag){
+          this.$showMessage('请添加报警器物料信息!!!')
+          return
+        }
+        if (numOne.length > 1){
+          this.$showMessage("暂时支持单个报警器物料安装!!!")
+          return
+        }
+        datatemp.sqvalue = this.show_data.areaData.sqvalue
+        //区域地址存入材料记录表
+        let areares = await this.$resetpost(
+          `rs/logic/saveArea`,
+          {data: datatemp},
+          {resolveMsg: null, rejectMsg: '区域地址保存失败'}
+        )
+
+        //完工之后推送数据到汉威
+        let adddata = {
+          f_bjq_sid : datatemp.f_bjq_sid,
+          f_material_code : datatemp.f_material_code,
+          f_bjq_address: this.show_data.areaData.sqvalue,
+          f_user_name: this.show_data.f_user_name,
+          f_address: this.show_data.f_address,
+          f_user_phone: this.show_data.f_phone,
+          f_userinfo_code: this.show_data.f_userinfo_code,
+          installtime: this.show_data.f_construction_date,
+        }
+        let res = await this.$resetpost(
+          `ncc/rs/logic/bjqadduser`,
+          // `rs/logic/bjqadduser`,
+          adddata
+        )
+        if (res.data.code != 200){
+          this.$showMessage(res.data.msg)
+          return
+        }
+      }
+
       let res = await this.$resetpost(
         `rs/logic/ApplyProductService`,
         {data: this.show_data},
         {resolveMsg: null, rejectMsg: '数据保存失败'}
       )
 
+
       if (this.show_data.button.after) {
         this[this.show_data.button.after]()
       }

package/src/components/product/ServiceView.vue

@@ -188,6 +188,18 @@
             </div>
           </div>
         </div>
+        <!--区域地址联动-->
+        <div>
+          <res-area-select-group
+            v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工' && data.title === '工程施工' && data.f_sub_state !='完工'"
+            labelstyle = "control-label"
+            @shiji-select = "getSelectShijiValue"
+            @xian-select = "getSelectXianValue"
+            @shequ-select = "getSelectShequValue"
+          >
+          </res-area-select-group>
+        </div>
+
       </div>
 
       <!-- onetomany -->
@@ -200,7 +212,48 @@
       </div>
 
       <!--自定义组件-->
-      <slot></slot>
+      <slot>
+        <!--<div :style="item.style ? item.style+';height: 40px;margin-bottom: 20px':'height: 40px;margin-bottom: 20px'"-->
+        <!--     v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工'"-->
+        <!--     :class="[$v.f_idnumber2.identityCardValid ? 'has-error' : '',item.bootstraped ? item.bootstraped + ' form-group':'col-sm-4 form-group']">-->
+
+        <!--<div class="col-sm-6 form-group "-->
+        <!--     :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">-->
+        <!--  <label class="font_normal_body">省&ensp;市&ensp;区</label>-->
+        <!--  <input type="text" style="width:41%" v-show="false" v-model="model.f_pcd_id"-->
+        <!--         v-validate:f_pcd_id='{required: true }'-->
+        <!--  >-->
+
+        <!--  <v-select :value.sync="model.f_pcd_id" :value-single="true"-->
+        <!--            :options='pcdslist' placeholder='请选择2'-->
+        <!--            close-on-select search="true" @change="pcdChange">-->
+        <!--  </v-select>-->
+        <!--</div>-->
+        <!--<div class="col-sm-6 form-group "-->
+        <!--     :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">-->
+        <!--  <label class="font_normal_body">街道/乡镇</label>-->
+        <!--  <input type="text" style="width:41%" v-show="false" v-model="model.f_street_id"-->
+        <!--  >-->
+        <!--  <v-select :value.sync="model.f_street_id" :value-single="true"-->
+        <!--            :options='streetslist' placeholder='请选择'-->
+        <!--            @change="streetChange"-->
+        <!--            close-on-select search="true">-->
+        <!--  </v-select>-->
+
+        <!--</div>-->
+        <!--<div class="col-sm-6 form-group "-->
+        <!--     :class="[$v.f_residential_area_id.required ? 'has-error' : 'has-success']">-->
+        <!--  <label class="font_normal_body">集收单位</label>-->
+        <!--  <input type="text" style="width:41%" v-show="false" v-model="model.f_residential_area_id"-->
+        <!--         v-validate:f_residential_area_id='{required: true }'>-->
+        <!--  <v-select :value.sync="model.f_residential_area_id" :value-single="true"-->
+        <!--            :options='areaslist' placeholder='请选择'-->
+        <!--            @change="" @select-search="selectSearch"-->
+        <!--            close-on-select search="true">-->
+        <!--  </v-select>-->
+        <!--</div>-->
+        <!--</div>-->
+      </slot>
       <!--公司等属性-->
       <div class="col-sm-12 form-group text-center" style="padding-top:8px">
         <div class="col-sm-3 form-group center-block">
@@ -360,6 +413,7 @@
 <script>
 import Vue from 'vue'
 import {isEmpty} from '../Util'
+import {HttpResetClass} from 'vue-client'
 // Date格式化
 Date.prototype.Format = function (fmt) {
   var o = {
@@ -390,7 +444,18 @@ export default {
       model: {}, // 公司等属性
       disable_button: true, // 控制按钮禁用
       disable_modal_button: true, // 控制按钮禁用
-      showButModal: false
+      //初始化省市区数据
+      pcdslist: [],
+      //初始化街道数据
+      streetslist: [],
+      //初始化街道数据
+      areaslist: [],
+      showButModal: false,
+      areaData:{
+        sjvalue:'',
+        xianvalue:'',
+        sqvalue:'',
+      }
     }
   },
   watch: {
@@ -416,7 +481,6 @@ export default {
 
       // 是否禁用按钮
       this.disableButton()
-
       // 公司等属性初始化
       if (this.data.orgs) {
         this.model.orgs = this.data.orgs
@@ -438,11 +502,182 @@ export default {
       } else {
         this.model.operator = this.$login.f.name
       }
+
+      this.initpcds(` j_orgid = '${this.$login.f.orgid}'`)
+    },
+    async getSelectShijiValue(sjvalue,sjlable) {
+      this.areaData.sjvalue = sjvalue
+      console.log("这是父级接收的市级值:",sjvalue,sjlable)
+      this.data.areaData = this.areaData
+
+      // 是否禁用按钮
+      this.disableButton()
+    },
+    async getSelectXianValue(xianvalue,xianlable) {
+      this.areaData.xianvalue = xianvalue
+      this.data.areaData = this.areaData
+      console.log("这是父级接收的县级值:",xianvalue,xianlable)
+
+      // 是否禁用按钮
+      this.disableButton()
+    },
+    async getSelectShequValue(sqvalue,sqlable) {
+      this.areaData.sqvalue = sqvalue
+      this.data.areaData = this.areaData
+      console.log("这是父级接收的社区值:",sqvalue,sqlable)
+
+      // 是否禁用按钮
+      this.disableButton()
+    },
+    //初始化省市区,添加街道
+    async initpcds(pconditon) {
+      // console.log('initpcds', pconditon)
+      // this.pcdslist = []
+      // let HttpReset = new HttpResetClass()
+      // let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+      //   data: {
+      //     items: '*',
+      //     tablename: 'j_bjqpcd',
+      //     orderitem: 'id',
+      //     condition: pconditon
+      //   }
+      // }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+      // let redata = []
+      // req.data.forEach((row, n) => {
+      //   redata[n] = {
+      //     label: row.j_areaname,
+      //     value: row.j_areaid,
+      //     data: row,
+      //     id: row.id
+      //   }
+      // })
+      // console.log('市区', redata)
+      // this.pcdslist = redata
+    },
+    //初始化街道 添加小区
+    async initstreets(pconditon) {
+      // console.log('市区32', pconditon)
+      // this.streetslist = []
+      // let HttpReset = new HttpResetClass()
+      // let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+      //   data: {
+      //     items: '*',
+      //     tablename: 'j_bjqstreet',
+      //     orderitem: 'id',
+      //     condition: pconditon
+      //   }
+      // }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+      // let redata = []
+      // req.data.forEach((row, n) => {
+      //   redata[n] = {
+      //     label: row.j_areaname,
+      //     value: row.j_areaid,
+      //     data: row,
+      //     id: row.id
+      //   }
+      // })
+      // console.log('市区333', redata)
+      // this.streetslist = redata
+      // this.model.f_iscity = this.findbyid(this.streetslist, this.model.f_street_id).f_iscity
+    },
+    //初始化小区添加小区
+    async initareas(pconditon) {
+      // if(this.usertype){
+      //   pconditon=pconditon+` and  f_special='1' `
+      // }
+      // this.areaslist = []
+      // let HttpReset = new HttpResetClass()
+      // let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=100', {
+      //   data: {
+      //     items: '*',
+      //     tablename: 'j_bjqarea',
+      //     orderitem: 'id',
+      //     condition: pconditon
+      //   }
+      // }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+      // let redata = []
+      // req.data.forEach((row) => {
+      //   redata.push({
+      //     label: row.j_areaname,
+      //     value: row.j_areaid,
+      //     data: row,
+      //     id: row.id
+      //   })
+      // })
+      // console.log('市区666', redata)
+      // if (redata.length>0){
+      //   this.areaslist = redata
+      // }
+    },
+    //省/市/区变化
+    async pcdChange(val) {
+
+      // console.log("省/市/区变化", val)
+      // console.log("省/市/区变化", `  f_pcd_id ='${val}' `)
+      // if (val) {
+      //   //那就把[小区，街道]重新组织一下
+      //   await this.initstreets(`  j_parentid ='${val}' `)
+      //   if (this.model.f_street_id) {
+      //     if (this.findbyid(this.streetslist, this.model.f_street_id)) {
+      //       let pcd_id = this.findbyid(this.streetslist, this.model.f_street_id).f_pcd_id
+      //       if (pcd_id != val) {
+      //         this.model.f_street_id = ''
+      //       }
+      //     } else {
+      //       this.model.f_street_id = ''
+      //     }
+      //
+      //     //那就把[小区，街道]重新组织一下
+      //     if (this.model.f_street_id) {
+      //       await this.initareas(` j_parentid ='${this.model.f_street_id}' `)
+      //       if (this.model.f_residential_area_id) {
+      //         if (this.findbyid(this.areaslist, this.model.f_residential_area_id)) {
+      //           let pcd_id = this.findbyid(this.areaslist, this.model.f_residential_area_id).f_pcd_id
+      //           if (pcd_id != val) {
+      //             this.model.f_residential_area_id = ''
+      //           }
+      //         } else {
+      //           this.model.f_residential_area_id = ''
+      //         }
+      //
+      //       }
+      //     }
+      //   }
+      // }
+      // this.$resetValidation()
+    },
+    //街道变化
+    async streetChange(val) {
+      // console.log("街道变化", val)
+      // if (this.streetslist[0]) {
+      //   var street = ''
+      //   this.streetslist.forEach((item) => {
+      //     if (item.id === val) {
+      //       street = item.label
+      //     }
+      //   })
+      //   this.model.f_address = street
+      // }
+      // if (val) {
+      //   //那就把[小区]重新组织一下
+      //   await this.initareas(` j_parentid ='${val}' `)
+      //   if (this.model.f_residential_area_id) {
+      //     if (this.findbyid(this.areaslist, this.model.f_residential_area_id)) {
+      //       let street_id = this.findbyid(this.areaslist, this.model.f_residential_area_id).f_street_id
+      //       if (street_id != val) {
+      //         this.model.f_residential_area_id = ''
+      //       }
+      //     } else {
+      //       this.model.f_residential_area_id = ''
+      //     }
+      //
+      //   }
+      // }
+      // this.$resetValidation()
     },
     // 是否禁用按钮
     disableButton () {
       let flag = false
-
       for (const field of this.data.fields) {
         if (field.required && !field.value && !field.hidden && field.value !== 0) {
           flag = true
@@ -458,6 +693,16 @@ export default {
         }
       }
 
+      //区域下拉框必选 流程模式为报警器报建
+       if (this.data.f_apply_type === '报警器报建' && this.data.defname === '工程施工' && this.data.title === '工程施工' && this.data.f_sub_state !='完工'){
+         if (!flag){
+           if (this.areaData.sjvalue ==null || this.areaData.sjvalue.length ==0 || this.areaData.sqvalue == null || this.areaData.sqvalue.length ==0
+             || this.areaData.xianvalue == null || this.areaData.xianvalue == 0){
+             console.log("区域为空禁止提交:",this.areaData)
+             flag = true
+           }
+         }
+       }
       this.disable_button = flag
     },
     // 失去焦点且值最终发生变化触发
@@ -514,6 +759,9 @@ export default {
     },
     // 点击按钮组按钮
     async click_but (button) {
+      //报警器区域地址
+      this.data.areaData = this.areaData
+
       this.disable_button = true
 
       this.data.fields.forEach(item => {
@@ -532,6 +780,7 @@ export default {
       } else {
         this.$dispatch('button')
       }
+
     },
     confirmModal () {
       this.closeModal()