apply-clients 3.0.10-20 → 3.0.10-200

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Jan 26 18:54:07 CST 2021
+gradle.version=3.5

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

package/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

package/gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.10-20",
+  "version": "3.0.10-200",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -27,6 +27,7 @@
   "author": "zx <939981212@qq.com>",
   "license": "ISC",
   "dependencies": {
+    "ant-design-vue": "^1.7.6",
     "co": "4.6.0",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
@@ -36,6 +37,7 @@
     "vue-bubble": "^1.0.3"
   },
   "devDependencies": {
+    "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
@@ -92,7 +94,7 @@
     "system-clients": "3.0.57",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "1.22.19-2",
+    "vue-client": "1.23.9-1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",
@@ -106,7 +108,6 @@
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0",
-    "axios": "0.15.3"
+    "weixin-js-sdk": "^1.2.0"
   }
 }

package/src/apply.js

@@ -24,12 +24,14 @@ export default function () {
   Vue.component('material-use-list', (resolve) => { require(['./components/product/Process/MaterialUseList'], resolve) })
   // 预算材料
   Vue.component('material-message', (resolve) => { require(['./components/product/Process/Processes/CustomerMaterialMessage'], resolve) })
-  //领取材料
+  // 领取材料
   Vue.component('receive-batch', (resolve) => { require(['./components/product/Process/Processes/ReceiveBatch'], resolve) })
   // 报建材料记录功能
   Vue.component('material_recording', (resolve) => { require(['./components/product/Function/functions/material_recording'], resolve) })
   // 档案tab页
   Vue.component('record-message', (resolve) => { require(['./components/product/Process/Processes/CustomerRecordMessage'], resolve) })
+  // 档案tab页1
+  // Vue.component('record-message1', (resolve) => { require(['./components/product/Process/Processes/CustomerRecordMessage1'], resolve) })
   // 材料tab页
   Vue.component('material-message', (resolve) => { require(['./components/product/Process/Processes/CustomerMaterialMessage'], resolve) })
   // 设备tab页
@@ -143,4 +145,43 @@ export default function () {
   Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
   // 汇总查询入口 src/components/product/Statistics/ApplyStatisticsROOT.vue
   Vue.component('apply-statistics-root', (resolve) => { require(['./components/product/Statistics/ApplyStatisticsROOT'], resolve) })
+  // 批量缴费
+  Vue.component('batch-pay', (resolve) => { require(['./components/product/BatchFunction/BatchPay'], resolve) })
+  // 交费明细报表
+  Vue.component('payment-report', (resolve) => { require(['./components/product/ReportForm/PaymentReport'], resolve) })
+  // 用户明细报表
+  Vue.component('user-report', (resolve) => { require(['./components/product/ReportForm/UserReport'], resolve) })
+  // 收费汇总报表
+  Vue.component('summary-report', (resolve) => { require(['./components/product/ReportForm/SummaryReport'], resolve) })
+  // 市场结算报表
+  Vue.component('settlement-report', (resolve) => { require(['./components/product/ReportForm/SettlementReport'], resolve) })
+  // 收费汇总报表
+  Vue.component('project-report', (resolve) => { require(['./components/product/ReportForm/ProjectReport'], resolve) })
+  // 打款记录汇总报表
+  Vue.component('payment-record-bad', (resolve) => { require(['./components/product/ReportForm/PaymentRecord'], resolve) })
+  // 打款记录明细报表
+  Vue.component('payment-record-detailed', (resolve) => { require(['./components/product/ReportForm/PaymentRecordDetailed'], resolve) })
+  // 打款记录新增
+  Vue.component('payment-record-add', (resolve) => { require(['./components/product/ReportForm/PaymentRecordAdd'], resolve) })
+  // 打款记录明细报表
+  Vue.component('payment-record', (resolve) => { require(['./components/product/ReportForm/PaymentRecordBad'], resolve) })
+  // 打款记录明细卡片
+  Vue.component('payment-record-too-bad', (resolve) => { require(['./components/product/ReportForm/PaymentRecordTooBad'], resolve) })
+
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
+
+  //      工程项目 添加项目信息
+  Vue.component('add-project-schedule', (resolve) => { require(['./components/product/ProjectManagement/AddProjectSchedule'], resolve) })
+  // 添加项目信息
+  Vue.component('project-schedule', (resolve) => { require(['./components/product/ProjectManagement/ProjectSchedule'], resolve) })
+  // 查询
+  Vue.component('project-list', (resolve) => { require(['./components/product/ProjectManagement/ProjectList'], resolve) })
+
+  //      隐患项目 添加项目信息
+  Vue.component('add-hidden-schedule', (resolve) => { require(['./components/product/HiddenDangersInProjects/AddHiddenDangers'], resolve) })
+  // 添加项目信息
+  Vue.component('hidden-project-schedule', (resolve) => { require(['./components/product/HiddenDangersInProjects/HiddenProjectSchedule'], resolve) })
+  // 查询
+  Vue.component('hidden-project-list', (resolve) => { require(['./components/product/HiddenDangersInProjects/HiddenProjectList'], resolve) })
+
 }

package/src/components/Util.js

@@ -21,6 +21,10 @@ export function getAttendanceState (item, timeToWork, timeToGo) {
   }
 }
 
+export function isEmpty (str) {
+  return str === undefined || str === null || str.toString().trim() === ''
+}
+
 export function toStandardYearMonth () {
   let dt = new Date()
   let month = dt.getMonth() + 1
@@ -44,7 +48,7 @@ export function toStartAndEndDateString () {
   let month = dt.getMonth() + 1
   // let date = dt.getDate()
   return [dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-01',
-  dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (new Date(dt.getFullYear(), month, 0).getDate())]
+    dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (new Date(dt.getFullYear(), month, 0).getDate())]
   // return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
 }
 
@@ -56,7 +60,7 @@ export function toStandardTimeString () {
   let min = dt.getMinutes()
   let sec = dt.getSeconds()
   return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) +
-  ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+    ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
 }
 
 export function to3339TimeString () {
@@ -67,7 +71,7 @@ export function to3339TimeString () {
   let min = dt.getMinutes()
   let sec = dt.getSeconds()
   return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) +
-   'T' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+    'T' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
 }
 
 export function parse3339String(strDate) {
@@ -91,11 +95,11 @@ export function guid() {
   let buf = new Uint16Array(8)
   window.crypto.getRandomValues(buf)
   let S4 = function(num) {
-      let ret = num.toString(16)
-      while(ret.length < 4){
-          ret = '0' + ret
-      }
-      return ret
+    let ret = num.toString(16)
+    while(ret.length < 4){
+      ret = '0' + ret
+    }
+    return ret
   }
   return (S4(buf[0])+S4(buf[1])+S4(buf[2])+S4(buf[3])+S4(buf[4])+S4(buf[5])+S4(buf[6])+S4(buf[7]))
 }
@@ -141,16 +145,16 @@ export function isFloat(n){
 
 // this will convert all true/false to boolean
 export function booleanFilter(paper) {
-    for(let key in paper) {
-      if(!paper.hasOwnProperty(key))
-        continue
-      if(typeof paper[key] == "object" && paper[key] != null) {
-        booleanFilter(paper[key]);
-      } else {
-        if(paper[key] === "true" || paper[key] == "false")
-          paper[key] = (paper[key] === "true")
-      }
+  for(let key in paper) {
+    if(!paper.hasOwnProperty(key))
+      continue
+    if(typeof paper[key] == "object" && paper[key] != null) {
+      booleanFilter(paper[key]);
+    } else {
+      if(paper[key] === "true" || paper[key] == "false")
+        paper[key] = (paper[key] === "true")
     }
+  }
 }
 // recursively traverse through each path
 export function ratifyPics(paper) {
@@ -185,11 +189,11 @@ export function loadscript(type, fileName) {
       element.setAttribute('async', '')
       element.setAttribute('defer', '')
       element.addEventListener('load', function() {
-                resolve(element)
-            }, false)
+        resolve(element)
+      }, false)
       element.addEventListener('error', function() {
-                reject(element)
-            }, false)
+        reject(element)
+      }, false)
       document.body.appendChild(element)
     }
   })
@@ -227,7 +231,7 @@ export function addDate (date, days) {
   let min = endDate.getMinutes()
   let sec = endDate.getSeconds()
   return endDate.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day) +
-  ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+    ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
   // return a
 }
 

package/src/components/app_apply/ApplyDownList.vue

@@ -3,7 +3,7 @@
     <!--<div class="app-botton" @click="back()">-->
     <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
     <!--</div>-->
-    <back-page :need-back='true'  @flag="back()"></back-page>
+<!--    <back-page :need-back='true'  @flag="back()"></back-page>-->
     <div class="bq-parent">
       <blockquote  style="color: #499edf;border-left-color: #499edf;font-size: 16px">
         <p>
@@ -19,16 +19,13 @@
           <div class="panel-body bg-info" style="padding: 10px">
             <div class="row form-group">
               <div class="col-sm-12 col-xs-12 col-md-12">
-                <div class="row" >
+                <div class="row"  @click="selected(row)">
                   <div :class="{'text-danger': row.f_remindersign}" class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     报建编号: {{row.f_apply_num}}<!--<span v-if="row.f_remindersign">(催单)</span>-->
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     用户姓名: {{row.f_user_name}}
                   </div>
-                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    用户类型: {{row.f_user_type}}
-                  </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     用户地址: {{row.f_address}}
                   </div>
@@ -48,9 +45,9 @@
 
                 </div>
               </div>
-              <div class="col-sm-12 col-xs-12 col-md-12">
-                <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="selected(row)">查看</button>
-              </div>
+<!--              <div class="col-sm-12 col-xs-12 col-md-12">-->
+<!--                <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" >查看</button>-->
+<!--              </div>-->
             </div>
           </div>
         </div>
@@ -83,6 +80,12 @@
     },
     methods: {
       selected (row) {
+        var pardate = {
+          _this:this,
+          tittle:'已办详情',
+          safe:true
+        }
+        this.$dispatch('gotoson',pardate)
         row.canedit = false
         if(this.sourcet == '横屏'){
           this.$goto('placecontrolerapp', {row: row},'self',this.search)
@@ -140,6 +143,16 @@
         _this.search()
       }, 6000000)//60000
     },
+    created(){
+      var result = HostApp.readLocalFile('workflow_apply.json')
+      if(result.code == 500){
+        this.$showMessage('获取流程配置文件失败，请联系系统管理员')
+        return
+      }
+      var data = JSON.parse(result.data)
+      console.log('前台存入缓存中的data=>' + JSON.stringify(data))
+      Vue.workflow_vue = Vue.prototype.$workflow_vue = data
+    }
   }
 </script>