npm - apply-clients - Versions diffs - 3.4.73 → 3.4.75 - Mend

apply-clients 3.4.73 → 3.4.75

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/build/dev-server.js +119 -116
package/package.json +1 -1
package/src/filiale/hongda/pc/ServiceView.vue +1 -1
package/src/filiale/hongda/pc.js +6 -6
package/src/filiale/linzhou/pc/ServiceControl.vue +27 -22
package/src/filiale/linzhou/pc/SupervisoryServiceControl.vue +884 -0
package/src/filiale/linzhou/pc/chargeManagement.vue +675 -0
package/src/filiale/linzhou/pc.js +3 -1
package/src/main.js +23 -23

package/build/dev-server.js CHANGED Viewed

@@ -1,116 +1,119 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-var app = express()
-var compiler = webpack(config)
-var ldap = 'http://223.150.9.117:8100'
-var applyinstall = 'http://223.150.9.117:8100'
-var proxyTable = {
-  '/rs/workflow': {
-    target: applyinstall
-  },
-  '/rs/vue': {
-    target: ldap
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: ldap
-  },
-  // 街道查询
-  '/rs/sql/address_getstreetlist': {
-    target: ldap
-  },
-  // 创建街道
-  '/rs/logic/address_updatestreet': {
-    target: ldap
-  },
-  // 创建小区
-  '/rs/logic/address_updatearea': {
-    target: ldap
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: ldap
-  },
-  '/rs/logic/getInitData': {
-    target: ldap?ldap:applyinstall
-  },
-  '/rs/logic/getLogin': {
-    target: ldap
-  },
-  '/rs/file': {    // 文件上传
-    target: applyinstall
-  },
-  '/project': {    // 文件回显
-    target: applyinstall
-  },
-  '/rs': {
-    target: applyinstall
-  },
-  '/ws': {
-    target: applyinstall,
-    ws: true // 代理webSocket
-  }
-}
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-// serve webpack bundle output
-app.use(devMiddleware)
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-// serve pure static assets
-app.use('/static', express.static('./static'))
-module.exports = app.listen(8300, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8300')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+// var ldap = 'http://121.36.79.201:8400'
+// var applyinstall = 'http://121.36.79.201:8400'
+var ldap = 'http://219.138.226.181:8401'
+var applyinstall = 'http://219.138.226.181:8401'
+var proxyTable = {
+  '/rs/logic/getSaleInitData': {
+    target: ldap
+  },
+  '/rs/workflow': {
+    target: applyinstall
+  },
+  '/rs/vue': {
+    target: ldap
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: ldap
+  },
+  // 街道查询
+  '/rs/sql/address_getstreetlist': {
+    target: ldap
+  },
+  // 创建街道
+  '/rs/logic/address_updatestreet': {
+    target: ldap
+  },
+  // 创建小区
+  '/rs/logic/address_updatearea': {
+    target: ldap
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: ldap
+  },
+  '/rs/logic/getInitData': {
+    target: ldap?ldap:applyinstall
+  },
+  '/rs/logic/getLogin': {
+    target: ldap
+  },
+  '/rs/file': {    // 文件上传
+    target: applyinstall
+  },
+  '/project': {    // 文件回显
+    target: applyinstall
+  },
+  '/rs': {
+    target: applyinstall
+  },
+  '/ws': {
+    target: applyinstall,
+    ws: true // 代理webSocket
+  }
+}
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+// serve webpack bundle output
+app.use(devMiddleware)
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+// serve pure static assets
+app.use('/static', express.static('./static'))
+module.exports = app.listen(8300, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8300')
+})

package/package.json CHANGED Viewed

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

package/src/filiale/hongda/pc/ServiceView.vue CHANGED Viewed

@@ -441,7 +441,7 @@
 </template>
 <script>
 import Vue from 'vue'
-import {isEmpty} from '../Util'
+import {isEmpty} from '../../../components/Util'
 import {HttpResetClass} from 'vue-client'
 // Date格式化
 Date.prototype.Format = function (fmt) {

package/src/filiale/hongda/pc.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import Vue from 'vue'
-let specialComp = {
-  'exploration-select': (resolve) => { require(['./pc/ServiceView'], resolve) },
-}
-exports.specialComp = specialComp
+import Vue from 'vue'
+let specialComp = {
+  'service-view': (resolve) => { require(['./pc/ServiceView'], resolve) },
+}
+exports.specialComp = specialComp

package/src/filiale/linzhou/pc/ServiceControl.vue CHANGED Viewed

@@ -301,6 +301,14 @@
         let temp = JSON.parse(JSON.stringify(this.selectdata))
         console.log('打印下temp',temp)
         this.show_data = temp
+        for (const item of this.show_data.fields) {
+          if(item.label==='气价名称'){
+            item.value=this.show_data.f_price_name
+          }
+          if(item.label==='安装合同编号'&& this.show_data.f_whether_underground == '无'){
+            item.required=false
+          }
+        }
         this.$nextTick(() => {
           this.showview = true
         })
@@ -742,7 +750,7 @@
       },
       async getDesignerPeople () {
         let data = {
-          source: 'this.getParentByType($organization$).getChildByName($设计部报装$).getChildren()',
+          source: 'this.getParentByType($organization$).getChildByName($施工部报装$).getChildren()',
           userid: this.$login.f.id
         }
@@ -751,7 +759,7 @@
           'POST',
           `rs/search`,
           {data: data},
-          {resolveMsg: null, rejectMsg: '设计人员查询失败！！！'}
+          {resolveMsg: null, rejectMsg: '施工人员查询失败！！！'}
         )
         return res.data.map(item => {
@@ -763,9 +771,6 @@
       },
       async surveyStopApply () {
         console.log('终止报建！！！！！')
-        this.show_data.f_stop_reason = '现场勘察不符合报装条件'
         let data = {
           data: this.show_data,
           user: this.$login.f
@@ -1669,23 +1674,13 @@
           && (this.show_data.defname === '报装申请') && this.show_data.button.button_name === '提交'){
           await this.contract_number()
         }
-        // if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && (this.show_data.button.button_name === '保存'||this.show_data.button.button_name === '提交')){
-        //   let dataz = {
-        //     condition: `u.id = ${this.show_data.id}`,
-        //     data: {
-        //       id: this.$login.f.id,
-        //       orgid: this.$login.f.orgid
-        //     }
-        //   }
-        //   let http = new HttpResetClass()
-        //   let restpz = await http.load(
-        //     'POST',
-        //     `rs/sql/checkuser`,
-        //     {data: dataz},
-        //     {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
-        //   )
-        //   this.show_data.actid=restpz.data[0].actid
-        // }
+        if (this.show_data.defname === '验收送气' && this.show_data.f_air_tightness === '不合格' && this.show_data.button.button_name === '提交'){
+          this.show_data.button.button_name = '维修'
+        }
+        if (this.show_data.defname === '踏勘设计' && this.show_data.f_is_have === '否' && this.show_data.button.button_name === '提交'){
+           this.surveyStopApply()
+          return
+        }
         let res = await this.$resetpost(
           `rs/logic/ApplyProductService`,
           {data: this.show_data},
@@ -1841,6 +1836,16 @@
             this.setLabelValue("地址", f_address)
           }
         }
+        if (this.show_data.defname === '踏勘设计' && this.show_data.f_is_have === '否'){
+          if (this.show_data.fields[index+1].label == '不具备安装原因'){
+            this.show_data.fields[index+1].hidden = false
+            this.show_data.fields[index+1].required = true
+          }
+        }
+        if (this.show_data.defname === '工程派工' && this.show_data.f_start_build && this.show_data.f_end_build){
+          this.show_data.f_build_days = (new Date(this.show_data.f_end_build) - new Date(this.show_data.f_start_build))/1000/60/60/24
+          this.setLabelValue("预计施工天数", this.show_data.f_build_days)
+        }
       },
       selectSearch (val, index) {},
       'onblur' (index) {},