apply-clients 5.0.35-54 → 5.0.35-55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "5.0.35-54",
+  "version": "5.0.35-55",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -90,7 +90,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "system-clients": "1.6.38",
-    "system-phone": "1.2.76-13-ezhou",
+    "system-phone": "1.2.76-14-ezhou",
     "url-loader": "^0.5.7",
     "vue-client": "1.23.10",
     "vue-hot-reload-api": "^1.2.0",

package/src/components/app_apply/Gongcheng.vue

@@ -9,12 +9,15 @@
         <div class=" row">
           待办工程<span v-if="rows">（{{ rows.length }}单）</span>
           <span v-if="!rows">（暂无待处理工程单）</span>
+          <button class="btn btn-primary btn-sm" type="button" style="float:right"
+                  @click="addactive('踏勘、建立工程编号')">
+            <span class="glyphicon glyphicon-plus" ></span>新增流程
+          </button>
           <img @click="search" src="../../assets/shuaxindaiban1.png" style="width: 40px;padding: 5px; float:right">
           <div style="margin-right: 3%;float:right;height: 30px " class="button_spacing"
                :class="{'button_shrink_top':criteriaShow,'button_shrink_bottom':!criteriaShow}" @click="hidden()"></div>
 
         </div>
-
       </blockquote>
 
     </div>
@@ -184,18 +187,22 @@ export default {
     upload() {
       this.$goto('up-load')
     },
-     addactive(modify) {
-      this.$workflow_vue.start_activity = modify
+    addactive(modify) {
+      var processid = ''
       let http = new HttpResetClass()
-      let res =  http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyGetProcessID`,{data:{filename:this.$workflow_vue.workflow_xmlfilename,start_activity:this.$workflow_vue.start_activity}}, {resolveMsg: null, rejectMsg: '获取流程ID失败，请联系开发人员'})
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyGetProcessID`, {data: {filename: '鄂州报建流程', start_activity: modify}}).then(res => {
+        processid = res.data.f_process_id
+      })
       let data = {
-        f_process_id: res.data.f_process_id,
-        f_product_id: res.data.f_product_id,
-        start_activity:this.$workflow_vue.start_activity,
-        user:Vue.user
+        f_process_id: processid,
+        f_product_id: 1,
+        start_activity: modify,
+        user: Vue.user
       }
-      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/newaddApplyproduct`,{data:data}, {resolveMsg: null, rejectMsg: '转发失败，请联系开发人员'})
-    },
+      setTimeout(() => {
+        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/newaddApplyproduct`, {data: data})
+        }, 200)
+    }
   },
   ready() {
     this.search()

package/src/components/product/EngineeringSupervisory/EngineeringSupervisoryControl.vue

@@ -33,7 +33,7 @@
   import Vue from 'vue'
   import  {HttpResetClass} from 'vue-client'
     export default {
-      title: '流程监控',
+      title: '工程流程监控',
       props: [ 'defname'],
       data() {
         return {