apply-clients 5.0.35-56 → 5.0.35-59

package/package.json

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

package/src/components/app_apply/ApplyToDoList.vue

@@ -8,14 +8,6 @@
       <blockquote  style="padding: 10px 10px;margin: 0 0 0px;color: #499edf;border-left-color: #499edf;font-size: 16px">
         <div class=" row">
           待办报建<span v-if="rows">（{{rows.length}}单）</span>
-          <button class="btn btn-primary btn-sm" type="button" style="float: right"
-                  @click="$parent.$parent.addactive('报装申请')">
-            <span class="glyphicon glyphicon-plus" ></span>报装申请
-          </button>
-          <button class="btn btn-primary btn-sm" type="button" style="float: right"
-                  @click="$parent.$parent.addactive('集体报装申请')">
-            <span class="glyphicon glyphicon-plus" ></span>集体报装申请
-          </button>
           <span v-if="!rows">（暂无待处理报建单）</span>
           <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>
@@ -182,21 +174,6 @@ export default{
     },
     upload () {
       this.$goto('up-load')
-    },
-    addactive(modify) {
-      let http = new HttpResetClass()
-      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyGetProcessID`, {data: {filename: '鄂州报建流程', start_activity: modify}}).then(res => {
-        let data = {
-          f_process_id: res.data.f_process_id,
-          f_product_id: res.data.f_product_id,
-          start_activity: modify,
-          user: Vue.user,
-          defname: modify
-        }
-        setTimeout(() => {
-          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/newaddApplyproduct`, {data: data})
-        }, 400)
-      })
     }
   },
   ready () {

package/src/components/app_apply/Gongcheng.vue

@@ -11,7 +11,7 @@
           <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>新增流程
+            <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"
@@ -109,7 +109,17 @@ export default {
     return {
       // rows: Object
       rows: [],
-      model: {},
+      model: {
+        button: {
+          button_name: null,
+          button_index: null
+        },
+        f_filiale: null,
+        f_parentname: null,
+        f_operate_date: null,
+        f_operator: null,
+        f_hege: false
+      },
       criteriaShow: false,
       editshow: false,
       row: {
@@ -150,7 +160,7 @@ export default {
     search() {
       // app正式运行程序
       console.log('------app开始查询本地代办工单------')
-      var condition = "defname in ('现场勘查','验收','通气','现场勘查定价','安装通气')"
+      var condition = "defname not in ('完工')"
 
       console.log(JSON.stringify(this.model))
       if (this.model.f_user_name) {
@@ -188,24 +198,39 @@ export default {
       this.$goto('up-load')
     },
     addactive(modify) {
-      let http = new HttpResetClass()
-      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyGetProcessID`, {
-        data: {
-          filename: '鄂州报建流程',
-          start_activity: modify
-        }
-      }).then(res => {
-        let data = {
-          f_process_id: res.data.f_process_id,
-          f_product_id: res.data.f_product_id,
-          start_activity: modify,
-          user: Vue.user,
-          defname: modify
+      this.$showMessage('是否开启一个新的流程?', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          let http = new HttpResetClass()
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyGetProcessID`, {
+            data: {
+              filename: '鄂州报建流程',
+              start_activity: modify
+            }
+          }).then(res => {
+            let data = {
+              f_process_id: res.data.f_process_id,
+              f_product_id: res.data.f_product_id,
+              start_activity: modify,
+              user: Vue.user,
+              defname: modify
+            }
+            setTimeout(() => {
+            }, 200)
+            http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/newaddApplyproduct`, {data: data})
+            this.click(data)
+          })
         }
-        setTimeout(() => {
-          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/newaddApplyproduct`, {data: data})
-        }, 400)
       })
+    },
+    click (row) {
+      let _this = this
+      this.$dispatch('gotoson', {
+        _this: _this,
+        title: row.defname,
+        safe: true
+      })
+
+      this.$goto('service-control-app', {selectdata: row,show_data: {ppp: {}},selectmodel: this.model}, 'self', _this.search)
     }
   },
   ready() {
@@ -217,13 +242,11 @@ export default {
   },
   created() {
     var result = HostApp.readLocalFile('workflow_apply.json')
-    if (result.code == 500) {
+    if(result.code == 500){
       this.$showMessage('获取流程配置文件失败，请联系系统管理员')
       return
     }
-
-    var data = JSON.parse(result)
-    console.log(data)
+    var data = JSON.parse(result.data)
     /* var data={
       "start_activitys": [
         "集体报装申请",
@@ -428,8 +451,7 @@ export default {
               "required": true,
               "value": null,
               "hidden": true,
-              "options": [
-              ]
+              "options": []
             },
             {
               "label": "电话号码",
@@ -452,8 +474,7 @@ export default {
               "disabled": false,
               "required": true,
               "value": null,
-              "options": [
-              ]
+              "options": []
             },
             {
               "label": "勘察人员",
@@ -1892,8 +1913,7 @@ export default {
           "tables": [
             "t_apply"
           ],
-          "fields": [
-          ],
+          "fields": [],
           "buttons": [
             {
               "button_name": "保存"
@@ -1908,8 +1928,7 @@ export default {
           "tables": [
             "t_apply"
           ],
-          "fields": [
-          ]
+          "fields": []
         },
         {
           "title": "报装申请",
@@ -2206,8 +2225,7 @@ export default {
               "disabled": false,
               "hidden": true,
               "value": null,
-              "options": [
-              ]
+              "options": []
             },
             {
               "label": "电话号码",
@@ -2230,8 +2248,7 @@ export default {
               "disabled": false,
               "required": true,
               "value": null,
-              "options": [
-              ]
+              "options": []
             },
             {
               "label": "勘察人员",
@@ -2283,8 +2300,7 @@ export default {
               "readonly": true,
               "required": true,
               "value": "1",
-              "options": [
-              ]
+              "options": []
             },
             {
               "label": "证件号码",
@@ -3379,8 +3395,7 @@ export default {
               "required": false
             }
           ],
-          "onetomany": [
-          ],
+          "onetomany": [],
           "buttons": [
             {
               "button_name": "保存"