Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

src/api/zczl/zczl.js

@@ -80,3 +80,7 @@ export const getAllHbInfoByFpbh = params =>
 //附件下载
 export const downloadZczlAttachment = params =>
   post(`${base.alyIP}/zczl/downloadZczlAttachment`, params);
+
+//指令详情流程信息
+export const getZczlFlowInformation = params =>
+    post(`${base.alyIP}/zczl/getZczlFlowInformation`, params);

src/views/zczl/zczl/addsqfbzl.vue

@@ -144,7 +144,6 @@ export default {
     },
     submit(params) {
       let self = this;
-      console.log(this.$refs.formCompontent.fileLists)
       if (this.$refs.formCompontent.fileLists.file.length == 0) {
         this.$message.error("请选择附件");
         return;
@@ -189,7 +188,7 @@ export default {
       }
       params.append("xsbh", this.xsbh);
       params.append("xsType", this.xsType);
-      params.append("module", this.module); 
+      params.append("module", this.module);
       doAddZczlxx(params).then((res) => {
         if (res.success && res.code == 200) {
           this.$alert("保存成功!", "提示", {

src/views/zczl/zczl/detailZczl.vue

@@ -439,7 +439,8 @@ import {
   getHbspInfo,
   getAllHbInfoByFpbh,
   doEvaluate,
-  getAllResponseFromMe
+  getAllResponseFromMe,
+  getZczlFlowInformation
 } from "@/api/zczl/zczl.js"
 import SelectTreeDialog from "@c/treeCode_components.vue";
 import axios from "@/utils/http.js"
@@ -513,7 +514,6 @@ export default {
         qsrgajgdm: [],
         qsrjh: '',
         fpgzyq: '',
-        qsrgajgdm: ''
       },
       activities: [
         {
@@ -534,7 +534,8 @@ export default {
         }, {
           content: '默认样式的节点',
           timestamp: '2018-04-03 20:46'
-        }],
+        }
+      ],
       unitChilds: [],
       unitCode: [],
       info: {
@@ -720,9 +721,9 @@ export default {
     adopt(i) {
       this.SPform.spsftg = i
       this.SPform.zczlbh = this.zczlbh
+      this.SPform.fpbh = this.fpbh
       if (this.sub === 'HBSP') {
         this.SPform.hbbh = this.hbbh
-        this.SPform.fpbh = this.fpbh
       }
       this.$emit('post', this.SPform)
     },//需要我审批模块
@@ -774,7 +775,20 @@ export default {
         this.info = res.data
       }
       this.mainLoading = false;
-    })
+    });
+    /*获取指令流程接口，需要该功能时放开注释*/
+    /*    getZczlFlowInformation({zczlbh: this.zczlbh, fpbh: this.fpbh}).then(res => {
+          if (res.code === 200 && res.data.result.length > 0) {
+            for (let i = 0; i < res.data.result.length; i++) {
+              let label = {};
+              label.content = res.data.result[i].bljyqk;
+              label.timestamp = res.data.result[i].djsj;
+              label.color = '#0bbd87';
+              label.icon = 'el-icon-success';
+              this.activities.push(label);
+            }
+          }
+        })*/
     /*  getAllHbInfoByFpbh({fpbh: this.fpbh, zczlbh: this.zczlbh}).then(res => {
         if (res.code === 200) {
           this.melist = res.data.hbDetailList

src/views/zczl/zczl/wfqdzczl.vue

@@ -18,10 +18,12 @@
         ref="rightContent"
     >
       <template #btnGroup="scope">
-        <el-button @click="dele(scope.scope)" type="text" v-if="scope.scope.row.spsftg != '通过'">删除</el-button>
+        <el-button @click="dele(scope.scope)" type="text"
+                   v-if="scope.scope.row.spsftg == '草稿'||scope.scope.row.spsftg == '未通过'">删除
+        </el-button>
         <el-button @click="ONPJ(scope.scope)" type="text" v-if="scope.scope.row.nfpj=='1'">评价</el-button>
         <el-button @click="examine(scope.scope)"
-                   v-if="scope.scope.row.spsftg == '未通过' || scope.scope.row.spsftg == '草稿'" type="text">提请审批
+                   v-if="scope.scope.row.spsftg == '草稿'" type="text">提请审批
         </el-button>
       </template>
     </right-content>