apply-clients 3.3.78 → 3.3.83

package/src/components/product/ServiceView.vue

@@ -6,7 +6,7 @@
         <div v-for="(index,item) in data.fields">
           <!--input-->
           <div :style="item.style ? item.style+';height: 40px;margin-bottom: 20px':'height: 40px;margin-bottom: 20px'"
-               v-if="(item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email') && !item.hidden && (item.device === 'pc' || !item.device) && (item.label !== '证件号码')&&(item.label !== '身份证') && (item.label !== '用户电话')"
+               v-if="(item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email') && !item.hidden && (item.device === 'pc' || !item.device) && ( item.label != '证件号码')&&( item.label !== '身份证') && (item.label !== '用户电话')"
                :class="[item.required && !(item.value) ? 'has-error' : '',item.bootstraped ? item.bootstraped + ' form-group':'col-sm-4 form-group']">
             <label :style="item.label_style ? item.label_style : ''"
                    :class="item.label_bootstraped ? item.label_bootstraped+' control-label-justify control-label' : 'control-label-justify control-label col-sm-6'">{{item.label}}</label>
@@ -26,6 +26,27 @@
             </div>
           </div>
 
+          <!--input-->
+          <div :style="item.style ? item.style+';height: 40px;margin-bottom: 20px':'height: 40px;margin-bottom: 20px'"
+               v-if="((data.f_credentials === '军官证' ||data.f_credentials === '营业执照')&& item.label === '证件号码')"
+               :class="[item.required && !(item.value) ? 'has-error' : '',item.bootstraped ? item.bootstraped + ' form-group':'col-sm-4 form-group']">
+            <label :style="item.label_style ? item.label_style : ''"
+                   :class="item.label_bootstraped ? item.label_bootstraped+' control-label-justify control-label' : 'control-label-justify control-label col-sm-6'">{{item.label}}</label>
+            <div :style="item.value_style ? item.value_style:''"
+                 :class="item.value_bootstraped ? item.value_bootstraped : 'col-sm-6'">
+              <input class="form-control input_view" style=""
+                     :type="item.type"
+                     v-model="data.fields[index].value"
+                     :placeholder="item.placeholder"
+                     :value="data.fields[index].value"
+                     :readonly="item.readonly"
+                     :disabled="item.disabled"
+                     @change="onchange(index)"
+                     @blur="onblur(index)"
+                     @input="oninput(index)"
+              />
+            </div>
+          </div>
 
           <div :style="item.style ? item.style+';height: 40px;margin-bottom: 20px':'height: 40px;margin-bottom: 20px'"
                v-if="(item.label==='身份证') || (data.f_credentials === '身份证' && item.label === '证件号码')"
@@ -62,7 +83,7 @@
               <input class="form-control input_view" style=""
                      type="number"
                      oninput="if(value.length > 11) value=value.slice(0,11)"
-                     v-validate:f_user_phone="{minlength: 11, maxlength: 11  }"
+                     v-validate:f_user_phone="{minlength: 7, maxlength: 11  }"
                      v-model="data.fields[index].value"
                      :placeholder="item.placeholder"
                      :value="data.fields[index].value"
@@ -167,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 -->
@@ -179,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">
@@ -339,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 = {
@@ -369,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: {
@@ -395,7 +481,6 @@ export default {
 
       // 是否禁用按钮
       this.disableButton()
-
       // 公司等属性初始化
       if (this.data.orgs) {
         this.model.orgs = this.data.orgs
@@ -417,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
@@ -437,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
     },
     // 失去焦点且值最终发生变化触发
@@ -493,6 +759,9 @@ export default {
     },
     // 点击按钮组按钮
     async click_but (button) {
+      //报警器区域地址
+      this.data.areaData = this.areaData
+
       this.disable_button = true
 
       this.data.fields.forEach(item => {
@@ -511,6 +780,7 @@ export default {
       } else {
         this.$dispatch('button')
       }
+
     },
     confirmModal () {
       this.closeModal()

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -4,21 +4,26 @@
       <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
                 restype='organization'
-                :initresid='$parent.$parent.curorgid'
+                :initresid='$parent.$parent.curorgid'·
                 @res-select="$parent.$parent.getorg"
                 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="search"
-                     condition="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="search"-->
+<!--                     condition="f_apply_num = '{}'">-->
+<!--            </div>-->
             <div class="form-group col-sm-2 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
               <button class="button_search button_spacing" @click="$parent.$parent.loadPage()">返回</button>
@@ -38,10 +43,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="search"
+                     condition="f_apply_num = '{}'">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">联系电话：</label>
@@ -137,6 +148,12 @@
               <input type="text" style="width:60%" class="input_search" v-model="model.f_construction_unit"
                      v-on:keyup.enter="$parent.$parent.search()" condition="f_construction_unit like '%{}%'" placeholder='施工单位'>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">表&emsp;&emsp;号：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='表号' v-model="model.f_meternumber"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_meternumber like '%{}%'">
+            </div>
           </div>
         </div>
       </criteria>
@@ -252,7 +269,8 @@
           'f_operator': '发起人',
           'f_install_project': '安装项目',
           'f_construction_unit': '施工单位',
-          'f_construction_date': '施工时间'
+          'f_construction_date': '施工时间',
+          'f_meternumber':'表号'
         }
       }
     },