apply-clients 7.1.36-1 → 7.1.36-yuchuan-1

package/build/dev-server.js

@@ -10,8 +10,8 @@ var compiler = webpack(config)
 // var applyinstall = 'http://121.36.79.201:8400'
 // var ldap = 'http://193.168.1.64:8082'
 var ldap = 'http://193.168.1.6:8082'
-// var applyinstall = 'http://127.0.0.1:8080'
-var applyinstall = 'http://193.168.1.44:8400'
+var applyinstall = 'http://127.0.0.1:8080'
+// var applyinstall = 'http://193.168.1.44:8600'
 var fadada = 'http://127.0.0.1:8181'
 // var fadada = 'http://193.168.1.44:8400'
 
@@ -100,6 +100,12 @@ var proxyTable = {
   '/project': {    // 文件回显
     target: applyinstall
   },
+  '/rs/apply': {
+    target: applyinstall,
+    pathRewrite: {
+      '^/rs/apply': '/rs'
+    }
+  },
   '/rs': {
     target: applyinstall
   },

package/package.json

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

package/src/apply.js

@@ -11,6 +11,7 @@ export default function () {
   /**  报建流程业务 **/
   // 报建流程业务总入口
   Vue.component('exploration-user', (resolve) => { require(['./components/product/Process/ExplorationUser'], resolve) })
+  Vue.component('new-exploration-user', (resolve) => { require(['./components/product/Process/NewExplorationUser'], resolve) })
   // 报建流程业务总入口页面list布局
   Vue.component('exploration-select', (resolve) => { require(['./components/product/Process/ExplorationSelect'], resolve) })
   // 业务tab(control层)页
@@ -57,15 +58,16 @@ export default function () {
   Vue.component('print-build-order', (resolve) => { require(['./components/product/Print/BuildOrder/printBuildOrder'], resolve) })
   Vue.component('print-gai-order', (resolve) => { require(['./components/product/Print/BuildOrder/printGaiXianOrder'], resolve) })
   Vue.component('print-gaixian-order', (resolve) => { require(['./components/product/Print/OrderPrint/GaiXianOrder'], resolve) })
+  Vue.component('print-chaichu-order', (resolve) => { require(['./components/product/Print/OrderPrint/printChaiChuOrder'], resolve) })
 
   /** 点火派单 **/
   Vue.component('ignition-dispatch', (resolve) => { require(['./components/product/Ignition/IgnitionDispatch'], resolve) })
   Vue.component('ignition-record', (resolve) => { require(['./components/product/Ignition/IgnitionRecord'], resolve) })
-  Vue.component('ignition-list', (resolve) => { require(['./components/product/Ignition/IgnitionList'], resolve) })
-  Vue.component('ignition-list-manage', (resolve) => { require(['./components/product/Ignition/IgnitionListManage'], resolve) })
+  // Vue.component('ignition-list', (resolve) => { require(['./components/product/Ignition/IgnitionList'], resolve) })
+  Vue.component('ignition-list', (resolve) => { require(['./components/product/Ignition/IgnitionListManage'], resolve) })
 
   // 地址管理
-  Vue.component('apply-address-userinfo-management', (resolve) => { require(['./components/product/Process/Processes/addressAndUserinfoManagement'], resolve) })
+  Vue.component('apply-chai-chu-management', (resolve) => { require(['./components/product/Process/Processes/ApplyChaiChuInfo.vue'], resolve) })
   // 施工安装明细
   Vue.component('installation-details', (resolve) => { require(['./components/product/Process/Processes/InstallationDetails'], resolve) })
   // 收费管理
@@ -78,6 +80,8 @@ export default function () {
   Vue.component('select-userinfo', (resolve) => { require(['./components/product/Process/Processes/selectUserinfo'], resolve) })
   // 选择用户信息
   Vue.component('select-oldUserinfo', (resolve) => { require(['./components/product/Process/Processes/selectOldUserinfo'], resolve) })
+  // 选择需要拆除的用户信息
+  Vue.component('select-chaichu-userinfo', (resolve) => { require(['./components/product/Process/Processes/selectChaiChuUserinfo'], resolve) })
   // 选择报建项目
   Vue.component('select-apply', (resolve) => { require(['./components/product/Process/Processes/selectApply'], resolve) })
   // 设备管理
@@ -101,9 +105,32 @@ 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-printpaymentapproval', (resolve) => { require(['./components/product/Process/Processes/Print/printPaymentApproval'], resolve) })
+  // 气量核算付款事由票据
+  Vue.component('apply-printpayment—subject', (resolve) => { require(['./components/product/Process/Processes/Print/printPaymentSubject'], resolve) })
   // 设备变更
   Vue.component('new-apply-devices-management', (resolve) => { require(['./components/product/Process/Processes/newDevicesManagement'], resolve) })
   Vue.component('new-installation-details', (resolve) => { require(['./components/product/Process/Processes/newInstallationDetails'], resolve) })
+  // 管线建设登记
+  Vue.component('guan-xian-exploration-user', (resolve) => { require(['./components/product/ApplyGuanXian/GuanXianExplorationUser'], resolve) })
+  Vue.component('guan-xian-exploration-select', (resolve) => { require(['./components/product/ApplyGuanXian/GuanXianExplorationSelect'], resolve) })
+  Vue.component('guan-xian-cailiao', (resolve) => { require(['./components/product/ApplyGuanXian/GuanXianCaiLiao'], resolve) })
+  Vue.component('guan-xian-supervisoryh-cart', (resolve) => { require(['./components/product/ApplyGuanXian/GuanXianSupervisoryhCart'], resolve) })
+
+  Vue.component('tabs', (resolve) => { require(['./components/product/ApplyGuanXian/Tabs'], resolve) })
+  Vue.component('tab-button', (resolve) => { require(['./components/product/ApplyGuanXian/TabButton'], resolve) })
+  // 报表
+  Vue.component('apply-report-items', (resolve) => { require(['./components/product/Report/ReportItems.vue'], resolve) })
+  // 每月安装收入明细表
+  Vue.component('apply-stair-anzhuang', (resolve) => { require(['./components/product/Report/apply-stair-anzhuang.vue'], resolve) })
+  // 用户管理部通气月报表
+  Vue.component('apply-stair-tongqi', (resolve) => { require(['./components/product/Report/apply-stair-tongqi.vue'], resolve) })
+  // 市场开发部月度报表
+  Vue.component('apply-stair-kaifa', (resolve) => { require(['./components/product/Report/apply-stair-kaifa.vue'], resolve) })
+  // 用户管理部未通气月报表
+  Vue.component('apply-stair-wtongqi', (resolve) => { require(['./components/product/Report/apply-stair-wtongqi.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) })
 }

package/src/applyAndroid.js

@@ -73,4 +73,9 @@ export default function () {
   // 设备变更
   Vue.component('new-app-installation-details', (resolve) => { require(['./components/android/Process/Processes/newAppInstallationDetails.vue'], resolve) })
   Vue.component('new-app-devices-management', (resolve) => { require(['./components/android/Process/Processes/newAppDevicesManagement'], resolve) })
+  // 改线业务审核
+  Vue.component('bu-zhang-shenhe', (resolve) => { require(['./components/android/Task/ShenHe/BuZhangShenHe'], resolve) })
+  Vue.component('jing-li-shenhe', (resolve) => { require(['./components/android/Task/ShenHe/JingLiShenHe'], resolve) })
+  // 拆除用户管理
+  Vue.component('app-chai-chu-management', (resolve) => { require(['./components/android/Process/Processes/AppChaiChuInfo.vue'], resolve) })
 }

package/src/components/android/AppSign.vue

@@ -15,26 +15,29 @@
         <!-- 基本信息 -->
         <div class="form-group col-xs-12 panel panel-info">
           <div class="panel-heading head col-xs-12" style="background-color: #e8f4ff;margin-bottom: 10px">
-            <div class="col-xs-6 text-left">用户需知</div>
+            <div class="col-xs-6 text-left">用户须知</div>
           </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>
               <textarea rows="26" cols="42" readonly=true v-if="selectdata.f_apply_type === '非民用报建'">
 
-非民用设计后用户签字内容：
-     我单位/本人自愿委托贵公司作为一体化服务单位,组织实施我单位/本人所属天然气设施建设工程，包括天然气设施建设工程勘察、设计、施工、监理、竣工验收和材料供应等相关事宜。
-     安装天然气若遇邻居阻挡时由我单位/本人协调解决，否则不予勘设安装。我单位/本人签字后即认为同意。
-     设计员已向我单位/本人说明安装位置及条件，后期不得自行变更。
-     温馨提示：根据《中华人民共和国安全生产法》第二章三十六条、《陕西省燃气管理条例》第四章第三十二条，非居民燃气用户应当安装使用燃气泄露报警器、安全自动切断装置和防暴照明灯。由用户自行购买，并在工程安装完成后通气前调试完成。
+          我单位/本人自愿委托贵公司作为一体化服务单位,组织实施我单位/本人所属天然气设施建设工程，包括天然气设施建设工程勘察、设计、施工、监理、竣工验收、材料供应和燃气泄露报警器、安全自动切断装置等相关事宜。
+          安装天然气若遇邻居阻挡时由我单位/本人协调解决，否则不予勘设安装。
+          设计员己向我单位/本人说明安装位置及条件，后期不得自行变更。我单位/本人签字后即认为同意。
+          根据《中华人民共和国安全生产法》第二章三十六条、《陕西省燃气管理条例》 第四章第三十二条：“非居民燃气用户必须安装使用燃气泄露报警器、安全自动切断装置和防暴照明灯。”用户也可自行购买安装，自行购买安装的用户须提供以下资料：
+          1、提供产品质量检验报告和产品合格证书；
+          2、提供购货发票复印件；
+          3、提供产品消防认证；
+          4、提供安装单位工程施工资料；
+          5、提供安装单位资质；
+          6、用户外购安装报警器需在我公司备案（不收取任何费用）。
+
 
               </textarea>
             </div>