apply-clients 7.1.36-yuchuan-4 → 7.1.36-yuchuan-5

package/index.html

@@ -13,7 +13,7 @@
       // 例如 ：serviceHost:'http://1.1.1.1:80/_AMapService',
     }
   </script>
-  <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.2&key=aa8b7c6a524337cb733152217fc1e52b"></script>
+  <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=aa8b7c6a524337cb733152217fc1e52b"></script>
   <!--引入UI组件库（1.1版本） -->
   <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
   <style media="screen">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.36-yuchuan-4",
+  "version": "7.1.36-yuchuan-5",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -64,7 +64,7 @@
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.17.0",
     "extract-text-webpack-plugin": "^1.0.1",
-    "fadada-clients": "1.0.18",
+    "fadada-clients": "1.0.19",
     "file-loader": "^0.8.4",
     "form-create": "^1.6.6",
     "function-bind": "^1.0.2",

package/src/apply.js

@@ -112,6 +112,8 @@ export default function () {
   Vue.component('apply-map-location', (resolve) => { require(['./components/product/ApplyMap/ApplyMapLocation'], resolve) })
   // 收费标准票据
   Vue.component('apply-printCharge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
+ // 报报建类型为改线业务，在核算费用环节添加打印预览的功能。
+  Vue.component('apply-gx-printCharge', (resolve) => { require(['./components/product/Process/Processes/Print/printGaiXianCharge.vue'], resolve) })
   // 气量核算票据
   Vue.component('apply-printpaymentapproval', (resolve) => { require(['./components/product/Process/Processes/Print/printPaymentApproval'], resolve) })
   // 气量核算付款事由票据
@@ -140,8 +142,12 @@ export default function () {
   // 用户管理部未通气月报表
   Vue.component('apply-gongchengbu', (resolve) => { require(['./components/product/Report/gongchengbu.vue'], resolve) })
   // 改线业务信息列表
-  Vue.component('apply-gai-xian-search', (resolve) => { require(['./components/product/ApplyGaiXianCharge/ApplyGaiXianChargeSearch.vue'], resolve) })
-  Vue.component('apply-gai-xian-list', (resolve) => { require(['./components/product/ApplyGaiXianCharge/ApplyGaiXianChargeList.vue'], resolve) })
+  Vue.component('apply-gai-xian-search', (resolve) => { require(['./components/product/ApplyGaiXianCharge/ApplyGaiXianChargeSearch.vue'], resolve) }),
+  Vue.component('apply-gai-xian-list', (resolve) => { require(['./components/product/ApplyGaiXianCharge/ApplyGaiXianChargeList.vue'], resolve) }),
   // 流程时间环节
-  Vue.component('apply-defname-time', (resolve) => { require(['./components/product/List/ShowAllActivity.vue'], resolve) })
+  Vue.component('apply-defname-time', (resolve) => { require(['./components/product/List/ShowAllActivity.vue'], resolve) }),
+    Vue.component('apply-adjustment-record', (resolve) => { require(['./components/product/records/AdjustmentRecordList.vue'], resolve) }),
+   // 费用调整记录
+  Vue.component('Apply-gaiXian-view-list', (resolve) => { require(['./components/product/ApplyGaiXianCharge/ApplyGaiXianViewList'], resolve) })
+  Vue.component('old-apply-devices-show', (resolve) => { require(['./components/product/List/OldShowDevices.vue'], resolve) })
 }

package/src/applyAndroid.js

@@ -40,6 +40,11 @@ export default function () {
   Vue.component('show-build', (resolve) => { require(['./components/android/Task/ShiGongXinXi/ShowBuild'], resolve) })
   // 施工信息控制层
   Vue.component('app-build-user', (resolve) => { require(['./components/android/Task/ShiGongXinXi/AppShowBuildUser'], resolve) })
+  //  已办信息
+  Vue.component('show-done', (resolve) => { require(['./components/android/Task/yiban/ShowDone'], resolve) })
+  // 已办信息控制层
+  Vue.component('app-satisfaction-show', (resolve) => { require(['./components/android/Task/yiban/satisfactionShow'], resolve) })
+  Vue.component('app-build-done', (resolve) => { require(['./components/android/Task/yiban/AppShowDone'], resolve) })
   // 施工通气
   Vue.component('app-build-ignition', (resolve) => { require(['./components/android/Task/BuildIgnition/BuildIgnition'], resolve) })
 
@@ -84,4 +89,8 @@ export default function () {
   Vue.component('app-exploration-guan-xian', (resolve) => { require(['./components/android/Task/GuanXianJianShe/AppExplorationGuanXian.vue'], resolve) })
   // 管线建设
   Vue.component('app-guan-xian-cailiao', (resolve) => { require(['./components/android/Task/GuanXianJianShe/AppGuanXianCaiLiao.vue'], resolve) })
+  // 铅封管理
+  Vue.component('seal-manage', (resolve) => { require(['./components/android/SealManage'], resolve) })
+  // 铅封绑定
+  Vue.component('seal-bind', (resolve) => { require(['./components/android/SealBind'], resolve) })
 }

package/src/components/android/AppSign.vue

@@ -19,13 +19,13 @@
           </div>
           <div class="form-group row">
             <div class="col-xs-12">
-              <textarea rows="26" cols="42" readonly=true v-if="selectdata.f_apply_type === '民用报建'" style="align: left">
+              <textarea rows="26" cols="30" readonly=true v-if="selectdata.f_apply_type === '民用报建'" style="align: left">
           我单位/本人自愿委托贵公司作为一体化服务单位,组织实施我单位/本人所属天然气设施建设工程，包括天然气设施建设工程勘察、设计、施工、监理、竣工验收和材料供应等相关事宜。
       安装天然气若遇邻居阻挡时由我单位/本人协调解决，否则不予勘设安装。我单位/本人签字后即认为同意。
       设计员已向我单位/本人说明安装位置及条件，后期不得自行变更。
 
               </textarea>
-              <textarea rows="26" cols="42" readonly=true v-if="selectdata.f_apply_type === '非民用报建'">
+              <textarea rows="26" cols="30" readonly=true v-if="selectdata.f_apply_type === '非民用报建'">
 
           我单位/本人自愿委托贵公司作为一体化服务单位,组织实施我单位/本人所属天然气设施建设工程，包括天然气设施建设工程勘察、设计、施工、监理、竣工验收、材料供应和燃气泄露报警器、安全自动切断装置等相关事宜。
           安装天然气若遇邻居阻挡时由我单位/本人协调解决，否则不予勘设安装。
@@ -102,7 +102,7 @@ export default {
       this.notification = false
       this.sign()
     },
-    sign () {
+    sign() {
       this.delAudioFile(this.f_sign_path)
       this.fileName = guid() + '.jpg'
       HostApp.__callback__ = this.signCallback
@@ -118,10 +118,13 @@ export default {
       console.log('==============签字回调============')
       console.log(signPath)
       HostApp.__this__.$set(prop, signPath)
+
+
       console.log(HostApp.__this__.f_sign_path)
 
       HostApp.__this__.uploadFile()
 
+
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
@@ -135,8 +138,8 @@ export default {
         fremarks: '报装手机签字文件',
         fileName: HostApp.__this__.fileName,
         fileUrl: HostApp.__this__.f_sign_path,
+        f_apply_type:HostApp.__this__.selectdata.f_apply_type,
       }
-
       console.log('-----------bzLogic-----------------')
       console.log(JSON.stringify(data))
       let res = HostApp.bzLogic({

package/src/components/android/AppUpload.vue

@@ -152,7 +152,7 @@ export default {
       let condition = ''
 
       condition = `f_blobid= '${this.headers.blodid}' `
-      if (this.headers.defname.indexOf('单位签字')){
+      if (this.headers.defname &&this.headers.defname.indexOf('单位签字')){
         let http = new HttpResetClass()
         let data = {
           tablename: 't_apply_sign',

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

@@ -220,43 +220,50 @@ export default {
       }
     },
     async applyVentilate () {
-      if (this.model.f_ignition_trouble === '有隐患'){
-        this.$showMessage("隐患未消除，无法提交")
+      let res = await this.$showMessage('是否需要继续此次操作')
+      if (res === 'cancel') {
         return
+      }else{
+        if (this.model.f_ignition_trouble === '有隐患'){
+          this.$showMessage("隐患未消除，无法提交")
+          return
+        }
+        let http = new HttpResetClass()
+        let data = {
+          selectdata: this.selectdata,
+          user: Vue.user
+        }
+        let res = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/logic/applyVentilate`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: `操作失败！！！`}
+        )
+        // 返回上层
+        this.$dispatch('confirm')
       }
-      let http = new HttpResetClass()
-      let data = {
-        selectdata: this.selectdata,
-        user: Vue.user
-      }
-
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/logic/applyVentilate`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: `操作失败！！！`}
-      )
-
-      // 返回上层
-      this.$dispatch('confirm')
     },
     async saveApplyVentilate () {
-      let http = new HttpResetClass()
-      let data = {
-        selectdata: this.selectdata,
-        user: Vue.user,
-        model:this.model
+      let res = await this.$showMessage('是否需要继续此次操作')
+      if (res === 'cancel') {
+        return
+      }else{
+        let http = new HttpResetClass()
+        let data = {
+          selectdata: this.selectdata,
+          user: Vue.user,
+          model:this.model
+        }
+        let res = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/logic/saveApplyVentilate`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: `操作失败！！！`}
+        )
+        // 刷新
+        this.$dispatch('confirm')
       }
 
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/logic/saveApplyVentilate`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: `操作失败！！！`}
-      )
-
-      // 刷新
-      this.$dispatch('confirm')
     },
     async cleanTrouble () {
       let http = new HttpResetClass()

package/src/components/android/Process/AppServiceControl.vue

@@ -35,7 +35,7 @@ Date.prototype.Format = function (fmt) {
 }
 export default {
   title: '报建流程业务控制层',
-  props: ['selectdata'],
+  props: ['selectdata', 'title'],
   data() {
     return {
       json_datas: null,
@@ -52,6 +52,7 @@ export default {
   methods: {
     async refurbish() {
       this.showview = false
+      let title=this.title
       let data = {
         workname: this.selectdata.processname
       }
@@ -156,7 +157,7 @@ export default {
             item.value = []
           }
         }
-        if(this.selectdata.defname === '施工信息'){
+        if(this.selectdata.defname === '施工信息'||this.title === '已办信息'){
           item.readonly = true
           item.disabled = true
         }
@@ -178,6 +179,7 @@ export default {
           })
         }
       }
+
       // 初始化onetomany
       if (this.selectdata.onetomany) {
         for (const item of this.selectdata.onetomany) {
@@ -304,7 +306,7 @@ export default {
           })
         }
       }
-      if(this.selectdata.defname === '施工信息'){
+      if(this.selectdata.defname === '施工信息'||this.title=== '已办信息'){
         this.selectdata.buttons = null
       }
       if (this.selectdata.f_apply_nature === '散户' && this.selectdata.defname === '现场勘察') {
@@ -501,6 +503,10 @@ export default {
         )
 
         this.selectdata = res.data[0]
+        this.selectdata.f_building=this.show_data.f_building
+        this.selectdata.f_unit=this.show_data.f_unit
+        this.selectdata.f_room=this.show_data.f_room
+        this.selectdata.pageIndex=this.show_data.pageIndex
       } else {
         this.selectdata = servicedata
       }
@@ -1119,7 +1125,7 @@ export default {
           this.setLabelOptions('气表型号', [{label: '无', value: 'null'}])
           return
         }
-        data = {
+         let data = {
           f_gasbrand_id: this.show_data.f_meter_brand
         }
         let res = await http.load(
@@ -1284,7 +1290,28 @@ export default {
     },
     async 'button'() {
       if (this.show_data.button.before) {
-        await this[this.show_data.button.before]()
+        //判断当前环节
+        if(this.show_data.defname=='现场勘察'||this.show_data.defname=='工程派工' ||this.show_data.defname=='工程施工'||this.show_data.defname=='点火通气'  ||this.show_data.defname=='监理单位派工' ||this.show_data.defname=='工程队派工' ||this.show_data.defname=='检测单位签字'  ||this.show_data.defname=='土建单位签字' ||this.show_data.defname=='监理单位签字' ||this.show_data.defname=='建设单位签字'){
+          if(this.show_data.button.button_name=='提交' || this.show_data.button.button_name=='保存' || this.show_data.button.button_name=='退回'){
+            let res = await this.$showMessage('是否需要继续此次操作')
+            if (res === 'cancel') {
+              return
+            }else{
+              await this[this.show_data.button.before]()
+            }
+          }
+        }
+      }else{
+        //判断当前环节
+        if(this.show_data.defname=='现场勘察'||this.show_data.defname=='工程派工' ||this.show_data.defname=='工程施工'||this.show_data.defname=='点火通气'  ||this.show_data.defname=='监理单位派工' ||this.show_data.defname=='工程队派工'){
+          if(this.show_data.button.button_name=='提交' || this.show_data.button.button_name=='保存' || this.show_data.button.button_name=='退回'){
+            let res = await this.$showMessage('是否需要继续此次操作')
+            if (res === 'cancel') {
+              return
+            }
+          }
+        }
+
       }
       // 点击重置按钮就重置数据
       if (this.show_data.button.button_name === '重置') {