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

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -83,6 +83,9 @@
         <ProcessTitle>
           <template slot="title">征求意见列表</template>
         </ProcessTitle>
+        <div class="effect" style="margin-bottom: 8px">
+          <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll">导出</el-button>
+        </div>
         <el-table
                 ref="multipleTable"
                 :data="data"
@@ -135,6 +138,11 @@
                     label="修改理由">
             </el-table-column>
           </el-table-column>
+          <el-table-column
+              prop="sourceType"
+              align="center"
+              label="来源">
+          </el-table-column>
           <el-table-column
                   prop="department"
                   align="center"
@@ -458,6 +466,37 @@
         }
         this.modalshowflag2 = false
       },
+      exportAll() {
+        const arr = JSON.stringify(this.data)
+        axios({
+          method: 'post',
+          url: 'api/slrs/sar-public-idea-all/tuallStandYJCL',
+          data: {
+            json: arr
+          },
+          dataType: 'json',
+          responseType: 'blob',
+        }).then(res => {
+          const blob = new Blob([res.data]);
+          const fileName = '流程意见详情.xlsx';
+          if ('download' in document.createElement('a')) { // 非IE下载
+            const elink = document.createElement('a');
+            elink.download = fileName;
+            elink.style.display = 'none';
+            elink.href = URL.createObjectURL(blob);
+            document.body.appendChild(elink);
+            elink.click();
+            URL.revokeObjectURL(elink.href);// 释放URL 对象
+            document.body.removeChild(elink);
+            this.loading = false;
+          } else { // IE10+下载
+            navigator.msSaveBlob(blob, fileName);
+            this.loading = false;
+          }
+        }).catch(error => {
+        })
+
+      },
       cancleUserInfo2 () {
         this.modalshowflag2 = false
       },
@@ -466,6 +505,7 @@
           this.itemId = row.id
           this.modalshowflag2 = true
           this.editForm = {
+            sourceType: row.sourceType,
             chapterNumber: row.chapterNumber,
             chapterName: row.chapterName,
             oldText: row.oldText,
@@ -584,9 +624,9 @@
             if (this.data[b].state === '3' && !this.data[b].cause) {
               a++
             }
-            if(!this.data[b].sourceType){
+            // if(!this.data[b].sourceType){
-              this.data[b].sourceType = '定向'
+            //   this.data[b].sourceType = '定向'
-            }
+            // }
           }
           if (a > 0) {
             this.$message.warning('请输入不上报原因')
@@ -644,6 +684,9 @@
               if (!item.source) {
                 item.source = '1'
               }
+              if (!item.sourceType) {
+                item.sourceType = '定向'
+              }
               if (item.state) {
               } else {
                 item.state = "1";

src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue

@@ -155,6 +155,11 @@
                     label="修改理由">
             </el-table-column>
           </el-table-column>
+          <el-table-column
+              prop="sourceType"
+              align="center"
+              label="来源">
+          </el-table-column>
           <el-table-column
                   prop="department"
                   align="center"

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -147,6 +147,11 @@
               label="修改理由">
             </el-table-column>
           </el-table-column>
+          <el-table-column
+              prop="sourceType"
+              align="center"
+              label="来源">
+          </el-table-column>
           <el-table-column
             prop="department"
             align="center"

src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue

@@ -147,6 +147,11 @@
               label="修改理由">
             </el-table-column>
           </el-table-column>
+          <el-table-column
+              prop="sourceType"
+              align="center"
+              label="来源">
+          </el-table-column>
           <el-table-column
             prop="department"
             align="center"

src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue

@@ -147,6 +147,11 @@
               label="修改理由">
             </el-table-column>
           </el-table-column>
+          <el-table-column
+              prop="sourceType"
+              align="center"
+              label="来源">
+          </el-table-column>
           <el-table-column
             prop="department"
             align="center"