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

# Conflicts:
#	src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

src/pages/processCenter/pages/newProcess/index.vue

@@ -142,6 +142,21 @@
             </div>
           </el-card>
         </el-col>
+        <el-col :span="size ? 6 : 8" v-btn-permission="''">
+          <el-card shadow="hover">
+            <div class="card-box" @click="handleCreateProcess('laws1')">
+              <div class="card-top">
+                <div class="card-top-left">
+                  <img :src="getImg(Math.floor(Math.random() * 6))">
+                </div>
+                <div class="card-top-right">
+                  <div class="card-top-right-text">政策入库流程</div>
+                  <div class="card-top-right-line"></div>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
         <el-col :span="size ? 6 : 8" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">
           <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('17')">
@@ -345,6 +360,12 @@ export default {
             name: 'bzdyStep1'
           })
           break
+        case 'laws1':
+          // 政策入库流程
+          this.$router.push({
+            name: 'zcrkStep1'
+          })
+          break
         case '1':
           // 标准入库流程
           this.$router.push({