apply-clients 3.1.57 → 3.1.59

package/package.json

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

package/src/components/product/Process/Service/ServiceControl.vue

@@ -1041,7 +1041,7 @@
           }
         }
         // 给后台存工改接口所需的附件
-          if(this.data.defname=='方案确认'){
+          /*if(this.data.defname=='方案确认'){
           let http = new HttpResetClass()
           await http.load('POST', 'rs/sql/singleTable', {
             data: {
@@ -1049,37 +1049,69 @@
               condition: " f_blobid='" +this.data.f_process_id + "' order by id desc"
             }
           }, {resolveMsg: null, rejectMsg: "附件获取失败"}, {silent: true})
-            .then((res) => {
-              model.url=res.data[0].f_downloadpath
+            .then(async (res1) => {
+              if(res1.data.length>0){
+                model.url=res1.data[0].f_downloadpath
+                model = Object.assign({}, this.selectdata, model)
+                let http = new HttpResetClass()
+                let requestData = {
+                  tables: this.data.tables,
+                  start_activity: this.$workflow_vue.start_activity,
+                  model: model,
+                  loginUser: this.$login.f,
+                  workflow_xmlfilename: this.$workflow_vue.workflow_xmlfilename
+                }
+                // 下发，提交，保存，退回通用业务后台处理logic
+                let url = 'rs/logic/ApplyProductService'
+
+                let res2 = await  http.load('POST', url, {data: requestData}, {resolveMsg: null, rejectMsg: '数据保存失败'})
+                if (res2.data.code == 200) {
+                  model = res2.data.model
+
+                  this.showview = false
+                  // 特殊处理
+                  this.$dispatch('close')
+                  this.initializtion()
+
+                } else {
+                  if (res2.data.msg) {
+                    this.$showMessage(res2.data.msg)
+                  }
+                }
+              }else{
+                this.$showMessage("请上传附件！")
+                return
+              }
             })
-        }
-        // 修改提交数据
-        model = Object.assign({}, this.selectdata, model)
-        let http = new HttpResetClass()
-        let requestData = {
-          tables: this.data.tables,
-          start_activity: this.$workflow_vue.start_activity,
-          model: model,
-          loginUser: this.$login.f,
-          workflow_xmlfilename: this.$workflow_vue.workflow_xmlfilename
-        }
-        // 下发，提交，保存，退回通用业务后台处理logic
-        let url = 'rs/logic/ApplyProductService'
+        }else{*/
+            // 修改提交数据
+            model = Object.assign({}, this.selectdata, model)
+            let http = new HttpResetClass()
+            let requestData = {
+              tables: this.data.tables,
+              start_activity: this.$workflow_vue.start_activity,
+              model: model,
+              loginUser: this.$login.f,
+              workflow_xmlfilename: this.$workflow_vue.workflow_xmlfilename
+            }
+            // 下发，提交，保存，退回通用业务后台处理logic
+            let url = 'rs/logic/ApplyProductService'
 
-        let res = await http.load('POST', url, {data: requestData}, {resolveMsg: null, rejectMsg: '数据保存失败'})
-        if (res.data.code == 200) {
-          model = res.data.model
+            let res = await http.load('POST', url, {data: requestData}, {resolveMsg: null, rejectMsg: '数据保存失败'})
+            if (res.data.code == 200) {
+              model = res.data.model
 
-          this.showview = false
-          // 特殊处理
-          this.$dispatch('close')
-          this.initializtion()
+              this.showview = false
+              // 特殊处理
+              this.$dispatch('close')
+              this.initializtion()
 
-        } else {
-          if (res.data.msg) {
-            this.$showMessage(res.data.msg)
-          }
-        }
+            } else {
+              if (res.data.msg) {
+                this.$showMessage(res.data.msg)
+              }
+            }
+          //}
       },
       // 失去焦点出触发事件
       async 'check'(index) {