apply-clients 3.4.88-2 → 3.4.88-20

package/build/dev-server.js

@@ -110,10 +110,10 @@ app.use(hotMiddleware)
 // serve pure static assets
 app.use('/static', express.static('./static'))
 
-module.exports = app.listen(8300, function (err) {
+module.exports = app.listen(8800, function (err) {
   if (err) {
     console.log(err)
     return
   }
-  console.log('Listening at http://localhost:8300')
+  console.log('Listening at http://localhost:8800')
 })

package/package.json

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

package/src/components/android/AppSign.vue

@@ -40,7 +40,6 @@ export default {
       this.$emit('sign-clean')
     },
     sign () {
-      debugger
       this.type='手机签字'
       console.log('==============签字打印this============',this)
       this.delAudioFile(this.f_sign_path)

package/src/components/android/Ignition/VentilationIgnition.vue

@@ -1,25 +1,6 @@
 <template>
   <div>
     <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab" :active.sync="active">
-      <tab header='任务地图'>
-        <div class="auto tip">
-          <p>当前任务数量：{{ tasknumber }}</p>
-          <p>当前任务点：{{labelmarksarray.length}}</p>
-        </div>
-        <amap-location
-          :islocation="true"
-          :locationzoomcenter="false"
-          :usenative="true"
-          :isshowsearch="false"
-          :mylocationinfo="false"
-          :islocationclearmark="false"
-          :isshowmapmodel="false"
-          :locationwindow="false"
-          mapmodel="dragMarker"
-          :labelmarksarray="labelmarksarray"
-          @diyspotmouseclick="diyspotmouseclick"
-        ></amap-location>
-      </tab>
       <tab header='任务列表'>
         <div class="p-10">
           <criteria-paged :model="model" v-ref:cp>
@@ -122,13 +103,6 @@
                     <p class="col-xs-3 text-left font"><b>地&emsp;&emsp;址：</b></p>
                     <p class="col-xs-9 text-left input-font">{{ row.f_address }}</p>
                   </div>
-                  <div class="col-xs-12">
-                    <p class="col-xs-3 text-left font"><b>定位地址：</b></p>
-                    <p class="col-xs-9 text-left input-font">
-                      {{ row.f_location_address }}
-                      <svg v-if="row.f_location_address" @click.prevent="$parent.$parent.$parent.$parent.$parent.openAmap(row)" style="width: 25px;height: 25px;position: absolute;" t="1628575336648" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3201" width="200" height="200"><path d="M512 956h-1.1c-10.9 0-20.5-6.9-24.7-17L369.9 654.1 85 537.8c-10.1-4.1-16.8-13.7-17.2-24.6-0.4-10.9 5.6-21 15.3-25.9l833-416.5c10.7-5.3 23.6-3.2 32.1 5.2s10.5 21.4 5.2 32.1L536.8 940.9c-4.7 9.4-14.3 15.1-24.8 15.1zM162.7 509.6l239 97.6c6.9 2.8 12.4 8.3 15.2 15.2l97.6 239 351.9-703.8-703.7 352z" fill="#666666" p-id="3202"></path></svg>
-                    </p>
-                  </div>
                   <div class="col-xs-12">
                     <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
                     <p class="col-xs-9 text-left input-font">
@@ -163,8 +137,6 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getWaitIgnitionTaskApp`, 20, null),
       // model: new PagedList(`rs/sql/getWaitIgnitionTask`, 20, null),
       criteriaShow: false,
-      tasknumber: 0,
-      labelmarksarray: [],
       active: 0,
       f_lat: null,
       f_lng: null,
@@ -177,7 +149,6 @@ export default {
   },
   methods: {
     refresh () {
-      this.getWaitIgnitionTaskDot()
       this.getArea()
       this.search()
     },
@@ -193,7 +164,7 @@ export default {
       row.f_apply_type = '通气点火'
       // row.f_process_id = row.f_blobid
       console.log('----------------------++++++++++++++++++',row.f_process_id)
-      this.$goto('ventilation-ignition-handle', {selectdata: row}, 'self', _this.refresh)
+      this.$goto('app-ignition-handle', {selectdata: row}, 'self', _this.refresh)
     },
     dialNumber (tel) {
       this.$showMessage(`是否拨打电话：${tel}`, ['confirm']).then((res) => {
@@ -202,68 +173,6 @@ export default {
         }
       })
     },
-    // 导航
-    openAmap (row) {
-      HostApp.openThirdPartyMap({
-        lon: row.f_lng,
-        lat: row.f_lat,
-        address: row.f_location_address
-      })
-    },
-    diyspotmouseclick (data) {
-      console.log('************************************')
-      console.log(data)
-      this.f_lat = data.f_lat
-      this.f_lng = data.f_lng
-      this.search()
-
-      this.active = 1
-    },
-    async getWaitIgnitionTaskDot () {
-      this.tasknumber = 0
-      let http = new HttpResetClass()
-      let data = {
-        userid: Vue.user.id
-        // userid: this.$login.f.id
-      }
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/getWaitIgnitionTaskDot`,
-        // `rs/sql/getWaitIgnitionTaskDot`,
-        {data: data},
-        {
-          resolveMsg: null,
-          rejectMsg: '任务点获取失败！！！'
-      })
-      this.labelmarksarray = res.data.map(item => {
-        this.tasknumber += item.count
-        return {
-          data: {
-            data: item,
-            content: `<p>任务数：${item.count}</p>`
-          },
-          position: [item.f_lng, item.f_lat],
-          isclearmarker: false,
-          islabel: false
-        }
-      })
-      // for (const item of res.data) {
-      //   this.tasknumber += item.count
-      //   if (isEmpty(item.f_lng) || isEmpty(item.f_lat)) {
-      //     continue
-      //   }
-      //
-      //   this.labelmarksarray.push({
-      //     data: {
-      //       data: item,
-      //       content: `<p>任务数：${item.count}</p>`
-      //     },
-      //     position: [item.f_lng, item.f_lat],
-      //     isclearmarker: true,
-      //     islabel: false
-      //   })
-      // }
-    },
     searchCondition (args) {
       args.condition += `and ir.f_ignition_operator_id = '${Vue.user.id}' and ir.f_state = '正在进行'`
       // args.condition += `and ir.f_ignition_operator_id = '${this.$login.f.id}' and ir.f_state = '正在进行'`
@@ -272,13 +181,8 @@ export default {
         // args.condition = args.condition.replace(`ir.f_ignition_operator_id = \'${this.$login.f.id}\'`, 'ir.f_shared_dispatch = \'是\'');
         args.condition = args.condition.replace(`ir.f_ignition_operator_id = \'${Vue.user.id}\'`, 'ir.f_shared_dispatch = \'是\'');
       }
-      if (!isEmpty(this.f_lat) && !isEmpty(this.f_lng)) {
-        args.condition += `and ui.f_lat = '${this.f_lat}' and ui.f_lng = '${this.f_lng}'`
-      }
       this.model.search(args.condition, args.model)
 
-      this.f_lng = null
-      this.f_lat = null
     },
     // 查询
     search () {
@@ -313,14 +217,14 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${Vue.user.f_fengongsi}' and f_area_status = '启用'`
+        condition: `f_filiale = '${Vue.user.orgid}' and f_area_status = '启用'`
         // condition: `f_filiale = '${this.$login.f.f_fengongsi}' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(
         'POST',
         // `rs/sql/applySingleTable`,
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`,
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
         {data: data},
         {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )

package/src/components/android/Ignition/VentilationIgnitionHandle.vue

@@ -113,9 +113,6 @@
       </div>
       <div class="col-xs-12 auto">
         <accordion one-at-a-time="true">
-          <panel header="设备查看" :is-open="false" type="primary">
-            <app-devices-management :selectdata="selectdata" :mark = 1 ></app-devices-management>
-          </panel>
           <panel header="拍照" :is-open="false" type="primary">
             <app-take-pic
               :blobid="selectdata.f_blobid"
@@ -128,14 +125,6 @@
           </panel>
         </accordion>
       </div>
-      <div class="col-xs-12 form-group auto" v-if="selectdata.f_meter_classify === '物联网表'">
-        <div class="col-xs-5">
-          <button style="width: 100%" class="btn btn-success" @click.prevent="openModal('退出强制状态')">退出强制状态</button>
-        </div>
-        <div class="col-xs-5 col-xs-offset-2">
-          <button style="width: 100%" class="btn btn-danger" @click.prevent="openModal('关阀')">强制关阀</button>
-        </div>
-      </div>
       <div class="col-xs-12 auto">
         <accordion one-at-a-time="true">
           <panel header="用户签字" :is-open="false" type="primary">
@@ -155,35 +144,6 @@
   </div>
 
   <validator name="v">
-    <modal v-if="showModal" :show.sync="showModal" v-ref:modal :large="true" :backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
-        <h4 class="modal-title">{{type}}操作</h4>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <div class="form-group row vertical-center">
-          <div class="col-xs-12" v-if="type !== '关阀'" :class="[$v.reason.required ? 'apply-has-error' : '']">
-            <input
-              type="checkbox"
-              class=""
-              :value.sync="boxReason"
-              v-model="boxReason"
-              :value="boxReason"
-              @change="changeAllChecked()"
-              ></input>{{ reasonOptions[0].label }}
-          </div>
-          <div class="col-xs-12" :class="[$v.reason.required ? 'apply-has-error' : '']">
-            <textarea rows="2" style="width: 100%;height: 100%"
-              :placeholder="type+'操作原因'" v-validate:reason = "['required']"
-              v-model="reason"  :value="reason"
-            ></textarea>
-          </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click="onOffValve" :disabled="!$v.valid">确认</button>
-      </footer>
-    </modal>
   </validator>
 </template>
 <script>
@@ -276,7 +236,6 @@ export default {
       this.$dispatch('confirm')
     },
     async search(){
-      console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>", this.selectdata.f_process_id + 'cs' + this.selectdata.defname + 'cs' + this.selectdata.f_apply_type)
       let data = {
         tablename: 't_ignition_record',
         condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
@@ -284,7 +243,7 @@ export default {
       let http = new HttpResetClass()
       let res = await http.load(
         'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`,
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
         {data: data},
         {resolveMsg: null, rejectMsg: '点火记录查询失败！！！'}
       )
@@ -292,67 +251,6 @@ export default {
         this.model.f_ignition_trouble = res.data[0].f_ignition_trouble
         this.model.f_ignition_remarks = res.data[0].f_ignition_remarks
       }
-    },
-    async onOffValve () {
-      let http = new HttpResetClass()
-      let data = null
-      let res = null
-
-      if (this.type !== '退出强制状态') {
-        data = {
-          condition: `f_meternumber = '${this.selectdata.f_meternumber}'`,
-          contentData: {
-            isOpen: this.type === '开阀' ? 1 : 0
-          },
-          inputtor: Vue.user.name,
-          instructTitle: this.type,
-          instructType: '阀门控制',
-          meterBrandName: this.selectdata.f_meter_brand
-        }
-        res = await http.load(
-          'POST',
-          `${this.$androidUtil.getProxyUrl()}/rs/logic/saveInstruct`,
-          {data: data},
-          {resolveMsg: null, rejectMsg: `${this.type}失败！！！`}
-        )
-      }
-
-      data = {
-        f_user_id: this.selectdata.f_user_id,
-        f_userinfo_id: this.selectdata.f_userinfo_id,
-        record: {
-          f_filiale: Vue.user.f_fengongsi,
-          f_instruct_meta_data: this.type === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
-          f_instruct_title: this.type === '退出强制状态' ? '退出强制阀控' : '进入强制阀控',
-          f_instruct_type: '阀门控制',
-          f_meternumber: this.selectdata.f_meternumber,
-          f_operator: Vue.user.name,
-          f_outlets: this.selectdata.f_outlets,
-          f_reason: this.reason,
-          f_user_id: this.selectdata.f_user_id,
-          f_userinfo_id: this.selectdata.f_userinfo_id
-        },
-        state: this.type === '退出强制状态' ? 0 : 1
-      }
-
-      res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/logic/updateNetWorkValve`,
-        {data: data},
-        {resolveMsg: '执行成功！！！', rejectMsg: `执行失败！！！`}
-      )
-
-      this.closeModal()
-    },
-    openModal (type) {
-      this.type = type
-      this.showModal = true
-    },
-    closeModal () {
-      this.showModal = false
-      this.type = null
-
-      this.reason = null
     }
   },
   events: {

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -228,9 +228,61 @@
             item.disabled = false
           }
         }
-      }
+      },
+      async getPrice (f_price_id) {
+        console.log('=======================')
+        console.log(f_price_id)
+
+        let data = {
+          condition: `sp.f_filialeid = '${this.$login.f.orgid}'`
+        }
+        // if(this.Pricetype==='机表'){
+        //   data.condition=`sp.f_custom = '机表'`
+        // }
+        // if(this.Pricetype==='非机表'){
+        //   data.condition=`sp.f_custom = '非机表'`
+        // }
+
+        if (!isEmpty(f_price_id)) {
+          data.condition = `sp.f_filialeid = '${this.$login.f.orgid}' and sp.f_price_id = ${f_price_id}`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/applyGetPrice`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '气价查询失败！！！'}
+        )
+
+        let a= res.data.map(item => {
+          return {
+            label: item.f_price_name,
+            value: item
+          }
+        })
+        this.selectdata.fields.forEach(field => {
+          if (field.label === '气价名称') {
+            field.options = a}
+        })
+        return a
+      },
     },
     events: {
+      // 选择气价
+      'priceChange' (index) {
+        if (isEmpty(this.show_data.stairPrice)) {
+          return
+        }
+
+        let stairPrice = this.getLableValue('气价名称')
+
+        this.setLabelValue('气价类型', stairPrice.f_price_type)
+        this.setLabelValue('用气性质', stairPrice.f_gasproperties)
+        this.setLabelValue('价格', stairPrice.f_price)
+        this.setLabelValue('客户类型', stairPrice.f_user_type)
+        this.show_data.f_price_id = stairPrice.id
+        this.show_data.f_price_name = stairPrice.f_price_name
+      },
       // 信息修改初始化
       'modifyInfoReadyEvent' () {
         this.$getConfig(this, 'UserAddress')

package/src/components/product/Ignition/IgnitionListManage.vue

@@ -139,7 +139,7 @@
                 <nobr><font>{{row.f_apply_num}}</font></nobr>
               </td>
               <td style="text-align: center;">
-                <nobr><font>{{row.f_userinfo_id}}</font></nobr>
+                <nobr><font>{{row.f_userinfo_code}}</font></nobr>
               </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_user_name}}</font></nobr>

package/src/components/product/Process/Processes/addressAndUserinfoManagement.vue

@@ -182,14 +182,6 @@
             console.log(this.selectdata.f_apply_count)
             console.log(this.model.count !== this.selectdata.f_apply_count)
             this.selectdata.f_apply_count = this.model.count
-
-            this.$resetpost(
-              'rs/entity/t_apply',
-              this.selectdata,
-              {resolveMsg: null, rejectMsg: '数据更新失败！！！'}
-            ).then(res => {
-              this.$dispatch('breakControl', this.selectdata)
-            })
           }
         }
       }