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

package/build/dev-server.js

@@ -12,8 +12,8 @@ var compiler = webpack(config)
 var ldap = 'http://193.168.1.6:8082'
 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'
+// var fadada = 'http://127.0.0.1:8181'
+var fadada = 'http://193.168.1.44:8600'
 
 var proxyTable = {
   // ---------------------------
@@ -95,9 +95,12 @@ var proxyTable = {
     target: ldap
   },
   '/rs/file': {    // 文件上传
-    target: applyinstall
+    target: ldap
   },
   '/project': {    // 文件回显
+    target: ldap
+  },
+  '/rs/logic/ApplyProductService': {
     target: applyinstall
   },
   '/rs/apply': {
@@ -109,6 +112,7 @@ var proxyTable = {
   '/rs': {
     target: applyinstall
   },
+
   '/ws': {
     target: applyinstall,
     ws: true // 代理webSocket

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.36-yuchuan-1",
+  "version": "7.1.36-yuchuan-3",
   "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.15",
+    "fadada-clients": "1.0.18",
     "file-loader": "^0.8.4",
     "form-create": "^1.6.6",
     "function-bind": "^1.0.2",
@@ -96,7 +96,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.6",
+    "system-clients": "3.2.67",
     "system-phone": "1.2.87-ycapply-7",
     "url-loader": "^0.5.7",
     "vue-client": "1.24.52",

package/src/apply.js

@@ -10,10 +10,15 @@ 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) })
+  Vue.component('new1-exploration-user', (resolve) => { require(['./components/product/Process/New1ExplorationUser'], resolve) })
+  Vue.component('new2-exploration-user', (resolve) => { require(['./components/product/Process/New2ExplorationUser'], resolve) })
   // 报建流程业务总入口页面list布局
   Vue.component('exploration-select', (resolve) => { require(['./components/product/Process/ExplorationSelect'], resolve) })
+  // 用来返回查询列表
+  Vue.component('new-exploration-select', (resolve) => { require(['./components/product/Process/NewExplorationSelect.vue'], resolve) })
   // 业务tab(control层)页
   Vue.component('service-control', (resolve) => { require(['./components/product/Process/Service/ServiceControl'], resolve) })
   // 公共业务显示(view层)页
@@ -25,8 +30,10 @@ export default function () {
   /** 报建监控业务 **/
   // 流程监控入口页
   Vue.component('supervisory-control', (resolve) => { require(['./components/product/Supervisory/SupervisoryControl'], resolve) })
+  Vue.component('yiban-supervisory-control', (resolve) => { require(['./components/product/Supervisory/YiBanSupervisoryControl.vue'], resolve) })
   // 流程监控列表页
   Vue.component('supervisory-list', (resolve) => { require(['./components/product/Supervisory/SupervisoryList'], resolve) })
+  Vue.component('yiban-supervisory-list', (resolve) => { require(['./components/product/Supervisory/YiBanSupervisoryList.vue'], resolve) })
   // 业务tab(control层)页
   Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
   // 流程列表页
@@ -99,7 +106,7 @@ export default function () {
   Vue.component('public-supervisoryh-cart', (resolve) => { require(['./public/history/PublicSupervisoryhCart'], resolve) })
 
   // 地图
-  Vue.component('apply-map-com', (resolve) => { require(['./components/product/ApplyMap/ApplyMapCom'], resolve) })
+  Vue.component('apply-map-com', (resolve) => { require(['./components/product/ApplyMap/ApplyMapCom.vue'], resolve) })
   Vue.component('apply-input-search', (resolve) => { require(['./components/product/ApplyMap/ApplyInputSearch'], resolve) })
   Vue.component('apply-drag-list', (resolve) => { require(['./components/product/ApplyMap/ApplyDragaboutList'], resolve) })
   Vue.component('apply-map-location', (resolve) => { require(['./components/product/ApplyMap/ApplyMapLocation'], resolve) })
@@ -130,7 +137,11 @@ export default function () {
   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-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-defname-time', (resolve) => { require(['./components/product/List/ShowAllActivity.vue'], resolve) })
 }

package/src/applyAndroid.js

@@ -40,6 +40,8 @@ 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('app-build-ignition', (resolve) => { require(['./components/android/Task/BuildIgnition/BuildIgnition'], resolve) })
 
   Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
   Vue.component('app-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
@@ -78,4 +80,8 @@ export default function () {
   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) })
+  // 管线建设
+  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) })
 }

package/src/components/android/AppUpload.vue

@@ -152,6 +152,21 @@ export default {
       let condition = ''
 
       condition = `f_blobid= '${this.headers.blodid}' `
+      if (this.headers.defname.indexOf('单位签字')){
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_apply_sign',
+          condition: `f_process_id = '${this.headers.blodid}'`
+        }
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`, {data: data}, {
+          warnMsg: null,
+          resolveMsg: null
+        })
+        if (res.data.length > 0){
+          condition = `(f_blobid= '${this.headers.blodid}' or  f_blobid= '${res.data[0].f_parent_process_id}')`
+        }
+      }
+
 
       if (!isEmpty(this.useType)) {
         condition += `and fusetype like '${this.useType}'`

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

@@ -160,7 +160,7 @@ export default {
   title: '通气点火',
   data () {
     return {
-      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getWaitIgnitionTask`, 20, null),
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getWaitIgnitionTaskApp`, 20, null),
       // model: new PagedList(`rs/sql/getWaitIgnitionTask`, 20, null),
       criteriaShow: false,
       tasknumber: 0,

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

@@ -134,7 +134,7 @@
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd 23:59:59'"
                           :show-reset-button="true"
-                          condition="f_apply_date <= '{}'">
+                          condition="u.f_apply_date <= '{}'">
               </datepicker>
             </div>
           </div>
@@ -155,7 +155,7 @@
 <!--          </div>-->
           <div class="row form-group text-right" style="">
             <button class="btn btn-primary" v-if="$parent.$parent.defname === '现场勘察'" @click="$parent.$parent.changeSearch()">{{ $parent.$parent.showSupervisory ? '需整改' : '正常' }}</button>
-            <button class="btn btn-primary" v-if="$parent.$parent.defname === '工程队派工'" @click="$parent.$parent.changeSearch()">{{ $parent.$parent.showSupervisory ? '有纠纷' : '正常' }}</button>
+            <button class="btn btn-primary" v-if="$parent.$parent.defname === '工程队派工' || $parent.$parent.defname === '维修派单'" @click="$parent.$parent.changeSearch()">{{ $parent.$parent.showSupervisory ? '有纠纷' : '正常' }}</button>
             <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
             <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
             <button class="btn" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></button>