Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue

@@ -188,7 +188,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
@@ -259,7 +258,7 @@ import rename from "process/creatProcess/qbzxdjhgk/component/rename";
 import establish from "process/creatProcess/qbzxdjhgk/component/establish";
 import delay from "process/creatProcess/qbzxdjhgk/component/delay";
 import cancel from "process/creatProcess/qbzxdjhgk/component/cancel";
-import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel} from "api/process";
+import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub } from "api/process";
 
 export default {
   name: "qbzxdjhgkStep1",
@@ -441,26 +440,53 @@ export default {
     },
     //流程保存
     handleSave() {
-      let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+      if(!this.approvalFlag){
-      qbzxdFrom.type = this.toggleType
+        //第一次正常保存
-      this.saveLoading = true
+        let qbzxdFrom = this.$refs["childForm"].qbfsForm;
-      let _formData = new FormData()
+        qbzxdFrom.type = this.toggleType
-      _formData.append('id', this.bpnId || '')
+        this.saveLoading = true
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
+        let _formData = new FormData()
-      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+        _formData.append('id', this.bpnId || '')
-      _formData.append('prcType', '25')
+        _formData.append('createUser', this.$store.getters.userInfo.userId)
-      _formData.append('json', JSON.stringify({
+        _formData.append('createUserName', this.$store.getters.userInfo.userName)
-        roleForm: this.roleForm,
+        _formData.append('prcType', '25')
-        qbfsForm: qbzxdFrom,
+        _formData.append('json', JSON.stringify({
-        commentText: this.commentText
+          roleForm: this.roleForm,
-      }))
+          qbfsForm: qbzxdFrom,
-      saveTaskFirst(_formData).then(res => {
+          commentText: this.commentText
-        this.saveLoading = false
+        }))
-        this.$message.success('保存成功')
+        saveTaskFirst(_formData).then(res => {
-        this.bpnId = res.result
+          this.saveLoading = false
-      }).catch(e => {
+          this.$message.success('保存成功')
-        this.saveLoading = false
+          this.bpnId = res.result
-      })
+        }).catch(e => {
+          this.saveLoading = false
+        })
+      }else{
+        //被驳回后的保存
+        this.saveLoading = true;
+        let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+        qbzxdFrom.type = this.toggleType
+        this.saveLoading = true
+        let _formData = new FormData()
+        _formData.append('id', this.bpnId || '')
+        _formData.append('createUser', this.$store.getters.userInfo.userId)
+        _formData.append('createUserName', this.$store.getters.userInfo.userName)
+        _formData.append('prcType', '25')
+        _formData.append('json', JSON.stringify({
+          roleForm: this.roleForm,
+          qbfsForm: qbzxdFrom,
+          commentText: this.commentText
+        }))
+        saveTaskForPub(_formData).then(res => {
+          this.saveLoading = false;
+          this.$message.success("保存成功");
+          this.bpnId = res.result;
+        }).catch(e => {
+          this.saveLoading = false;
+        });
+
+      }
     },
     //流程提交
     handleSubmit() {