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

src/pages/processCenter/pages/creatProcess/bzrk/step2.vue

@@ -715,20 +715,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <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 HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/bzrk/step3.vue

@@ -702,20 +702,17 @@
               prop="name"
               label="任务步骤"
               align="center"
-              sortable="custom"
           >
           </el-table-column>
           <el-table-column
               prop="assignee"
               label="任务受理人"
               align="center"
-              sortable="custom"
           >
           </el-table-column>
           <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 HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -1317,20 +1317,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <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 HH:mm:ss') : '' }}</span>

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

@@ -662,20 +662,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <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 HH:mm:ss') : '' }}</span>

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

@@ -640,7 +640,8 @@
             this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
               endTime: this.form.endTime
             }, {}, res => {
-              if (res.message === '1') {
+              //返回0 流程未到截止日期 不能进行操作
+              if (res.message === '0') {
                 this.clickFlag = false
               } else {
                 this.clickFlag = true

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

@@ -200,20 +200,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss') : '' }}</span>

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

@@ -200,20 +200,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue

@@ -225,7 +225,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue

@@ -185,7 +185,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 HH:mm:ss") : "" }}</span>

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

@@ -185,7 +185,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 HH:mm:ss") : "" }}</span>

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

@@ -185,7 +185,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue

@@ -286,7 +286,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue

@@ -246,7 +246,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue

@@ -246,7 +246,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

@@ -192,7 +192,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/qbfz/step2.vue

@@ -147,7 +147,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/qbfz/step3.vue

@@ -156,7 +156,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/qbfz/step4.vue

@@ -191,7 +191,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 HH:mm:ss") : "" }}</span>

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

@@ -191,7 +191,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 HH:mm:ss") : "" }}</span>

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

@@ -191,7 +191,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 HH:mm:ss") : "" }}</span>

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

@@ -191,7 +191,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 HH:mm:ss") : "" }}</span>

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

@@ -274,7 +274,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 HH:mm:ss") : "" }}</span>

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

@@ -282,7 +282,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 HH:mm:ss") : "" }}</span>

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

@@ -281,7 +281,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 HH:mm:ss") : "" }}</span>

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

@@ -282,7 +282,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 HH:mm:ss") : "" }}</span>

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

@@ -282,7 +282,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue

@@ -403,7 +403,6 @@
                 <el-table-column
                   prop="putTime"
                   label="实施日期"
-                  sortable
                   width="120"
                 >
                   <template slot-scope="scope">

src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue

@@ -106,7 +106,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/wbsm/step2.vue

@@ -106,7 +106,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/wbsm/step3.vue

@@ -106,7 +106,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/wbsm/step4.vue

@@ -106,7 +106,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 HH:mm:ss") : "" }}</span>

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

@@ -106,7 +106,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -112,7 +112,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue

@@ -115,7 +115,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue

@@ -115,7 +115,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue

@@ -96,7 +96,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 HH:mm:ss") : "" }}</span>

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

@@ -95,7 +95,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue

@@ -223,7 +223,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg/step2.vue

@@ -107,7 +107,7 @@
           </el-table-column>
           <el-table-column align="center" label="任务受理人" prop="assignee">
           </el-table-column>
-          <el-table-column align="center" label="创建时间" prop="createTime" sortable="custom">
+          <el-table-column align="center" label="创建时间" prop="createTime" >
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>

src/pages/processCenter/pages/creatProcess/xmpg/step3.vue

@@ -314,7 +314,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -223,7 +223,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 HH:mm:ss") : "" }}</span>

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

@@ -223,7 +223,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -255,7 +255,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -255,7 +255,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -255,7 +255,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 HH:mm:ss") : "" }}</span>

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

@@ -107,7 +107,7 @@
           </el-table-column>
           <el-table-column align="center" label="任务受理人" prop="assignee">
           </el-table-column>
-          <el-table-column align="center" label="创建时间" prop="createTime" sortable="custom">
+          <el-table-column align="center" label="创建时间" prop="createTime" >
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>

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

@@ -281,7 +281,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 HH:mm:ss") : "" }}</span>

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

@@ -213,7 +213,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 HH:mm:ss") : "" }}</span>

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

@@ -253,7 +253,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 HH:mm:ss") : "" }}</span>

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

@@ -255,7 +255,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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/zcch/step2.vue

@@ -224,20 +224,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <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 HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/zcch/step3.vue

@@ -224,20 +224,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <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 HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/zchh/step2.vue

@@ -261,20 +261,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <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 HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/zcrh/step2.vue

@@ -199,20 +199,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <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 HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/zcrh/step3.vue

@@ -199,20 +199,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <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 HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/zcrh/step4.vue

@@ -199,20 +199,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <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 HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/zcrk/step2.vue

@@ -527,20 +527,17 @@
                             prop="name"
                             label="任务步骤"
                             align="center"
-                            sortable="custom"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="assignee"
                             label="任务受理人"
                             align="center"
-                            sortable="custom"
                     >
                     </el-table-column>
                     <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>

src/pages/processCenter/pages/creatProcess/zcrk/step3.vue

@@ -554,20 +554,17 @@
                                     prop="name"
                                     label="任务步骤"
                                     align="center"
-                                    sortable="custom"
                             >
                             </el-table-column>
                             <el-table-column
                                     prop="assignee"
                                     label="任务受理人"
                                     align="center"
-                                    sortable="custom"
                             >
                             </el-table-column>
                             <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>

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

@@ -514,20 +514,17 @@
                   prop="name"
                   label="任务步骤"
                   align="center"
-                  sortable="custom"
               >
               </el-table-column>
               <el-table-column
                   prop="assignee"
                   label="任务受理人"
                   align="center"
-                  sortable="custom"
               >
               </el-table-column>
               <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>

src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue

@@ -80,20 +80,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue

@@ -169,20 +169,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/zczqyj/step4.vue

@@ -141,20 +141,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss') : '' }}</span>

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

@@ -215,20 +215,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

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

@@ -149,20 +149,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

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

@@ -149,20 +149,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

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

@@ -149,20 +149,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

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

@@ -149,20 +149,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

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

@@ -60,21 +60,18 @@
                 </el-table-column>
                 <el-table-column
                     prop="productType"
-                    sortable="custom"
                     width="200px"
                     align="center"
                     label="产品类型">
                 </el-table-column>
                 <el-table-column
                     prop="implTime"
-                    sortable="custom"
                     align="center"
                     width="200px"
                     label="实施日期">
                 </el-table-column>
                 <el-table-column
                     prop="implRequire"
-                    sortable="custom"
                     align="center"
                     width="200px"
                     label="实施要求">
@@ -297,7 +294,6 @@
               </el-table-column>
               <el-table-column
                   prop="implTime"
-                  sortable
                   label="实施时间"
                   width="150"
                   align="center">

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step2.vue

@@ -53,21 +53,18 @@
                 </el-table-column>
                 <el-table-column
                     prop="productType"
-                    sortable="custom"
                     width="200px"
                     align="center"
                     label="产品类型">
                 </el-table-column>
                 <el-table-column
                     prop="implTime"
-                    sortable="custom"
                     align="center"
                     width="200px"
                     label="实施日期">
                 </el-table-column>
                 <el-table-column
                     prop="implRequire"
-                    sortable="custom"
                     align="center"
                     width="200px"
                     label="实施要求">
@@ -105,20 +102,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step3.vue

@@ -53,21 +53,18 @@
                 </el-table-column>
                 <el-table-column
                     prop="productType"
-                    sortable="custom"
                     width="200px"
                     align="center"
                     label="产品类型">
                 </el-table-column>
                 <el-table-column
                     prop="implTime"
-                    sortable="custom"
                     align="center"
                     width="200px"
                     label="实施日期">
                 </el-table-column>
                 <el-table-column
                     prop="implRequire"
-                    sortable="custom"
                     align="center"
                     width="200px"
                     label="实施要求">
@@ -105,20 +102,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue

@@ -67,21 +67,18 @@
             </el-table-column>
             <el-table-column
                   prop="productType"
-                sortable="custom"
                 width="200px"
                 align="center"
                 label="产品类型">
             </el-table-column>
             <el-table-column
                 prop="implTime"
-                sortable="custom"
                 align="center"
                 width="200px"
                 label="实施日期">
             </el-table-column>
             <el-table-column
                 prop="implRequire"
-                sortable="custom"
                 align="center"
                 width="200px"
                 label="实施要求">
@@ -117,20 +114,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

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

@@ -59,7 +59,6 @@
               </el-table-column>
               <el-table-column
                   prop="productType"
-                  sortable="custom"
                   width="120"
                   align="center"
                   label="产品类型">
@@ -69,7 +68,6 @@
               </el-table-column>
               <el-table-column
                   prop="implTime"
-                  sortable="custom"
                   align="center"
                   width="155"
                   label="实施日期">
@@ -84,7 +82,6 @@
               </el-table-column>
               <el-table-column
                   prop="implRequire"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="实施要求">
@@ -94,7 +91,6 @@
               </el-table-column>
               <el-table-column
                   prop="conformSituation"
-                  sortable="custom"
                   align="center"
                   width="130"
                   label="资源符合情况">
@@ -104,7 +100,6 @@
               </el-table-column>
               <el-table-column
                   prop="devScheme"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="开发计划">
@@ -114,7 +109,6 @@
               </el-table-column>
               <el-table-column
                   prop="sopTime"
-                  sortable="custom"
                   align="center"
                   width="155"
                   label="SOP时间">
@@ -130,7 +124,6 @@
               </el-table-column>
               <el-table-column
                   prop="completeSituation"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="完成情况">
@@ -140,7 +133,6 @@
               </el-table-column>
               <el-table-column
                   prop="timeoutSituation"
-                  sortable="custom"
                   align="center"
                   width="400"
                   label="SOP时间超过法规时限的空档期的业务应对方案">
@@ -267,20 +259,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

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

@@ -53,56 +53,48 @@
               </el-table-column>
               <el-table-column
                   prop="productType"
-                  sortable="custom"
                   width="120"
                   align="center"
                   label="产品类型">
               </el-table-column>
               <el-table-column
                   prop="implTime"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="实施日期">
               </el-table-column>
               <el-table-column
                   prop="implRequire"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="实施要求">
               </el-table-column>
               <el-table-column
                   prop="conformSituation"
-                  sortable="custom"
                   align="center"
                   width="130"
                   label="资源符合情况">
               </el-table-column>
               <el-table-column
                   prop="devScheme"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="开发计划">
               </el-table-column>
               <el-table-column
                   prop="sopTime"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="SOP时间">
               </el-table-column>
               <el-table-column
                   prop="completeSituation"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="完成情况">
               </el-table-column>
               <el-table-column
                   prop="timeoutSituation"
-                  sortable="custom"
                   align="center"
                   width="400"
                   label="SOP时间超过法规时限的空档期的业务应对方案">
@@ -226,20 +218,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

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

@@ -53,56 +53,48 @@
               </el-table-column>
               <el-table-column
                   prop="productType"
-                  sortable="custom"
                   width="120"
                   align="center"
                   label="产品类型">
               </el-table-column>
               <el-table-column
                   prop="implTime"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="实施日期">
               </el-table-column>
               <el-table-column
                   prop="implRequire"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="实施要求">
               </el-table-column>
               <el-table-column
                   prop="conformSituation"
-                  sortable="custom"
                   align="center"
                   width="130"
                   label="资源符合情况">
               </el-table-column>
               <el-table-column
                   prop="devScheme"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="开发计划">
               </el-table-column>
               <el-table-column
                   prop="sopTime"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="SOP时间">
               </el-table-column>
               <el-table-column
                   prop="completeSituation"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="完成情况">
               </el-table-column>
               <el-table-column
                   prop="timeoutSituation"
-                  sortable="custom"
                   align="center"
                   width="400"
                   label="SOP时间超过法规时限的空档期的业务应对方案">
@@ -238,20 +230,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

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

@@ -53,56 +53,48 @@
               </el-table-column>
               <el-table-column
                   prop="productType"
-                  sortable="custom"
                   width="120"
                   align="center"
                   label="产品类型">
               </el-table-column>
               <el-table-column
                   prop="implTime"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="实施日期">
               </el-table-column>
               <el-table-column
                   prop="implRequire"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="实施要求">
               </el-table-column>
               <el-table-column
                   prop="conformSituation"
-                  sortable="custom"
                   align="center"
                   width="130"
                   label="资源符合情况">
               </el-table-column>
               <el-table-column
                   prop="devScheme"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="开发计划">
               </el-table-column>
               <el-table-column
                   prop="sopTime"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="SOP时间">
               </el-table-column>
               <el-table-column
                   prop="completeSituation"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="完成情况">
               </el-table-column>
               <el-table-column
                   prop="timeoutSituation"
-                  sortable="custom"
                   align="center"
                   width="400"
                   label="SOP时间超过法规时限的空档期的业务应对方案">
@@ -232,20 +224,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>

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

@@ -53,56 +53,48 @@
               </el-table-column>
               <el-table-column
                   prop="productType"
-                  sortable="custom"
                   width="120"
                   align="center"
                   label="产品类型">
               </el-table-column>
               <el-table-column
                   prop="implTime"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="实施日期">
               </el-table-column>
               <el-table-column
                   prop="implRequire"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="实施要求">
               </el-table-column>
               <el-table-column
                   prop="conformSituation"
-                  sortable="custom"
                   align="center"
                   width="130"
                   label="资源符合情况">
               </el-table-column>
               <el-table-column
                   prop="devScheme"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="开发计划">
               </el-table-column>
               <el-table-column
                   prop="sopTime"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="SOP时间">
               </el-table-column>
               <el-table-column
                   prop="completeSituation"
-                  sortable="custom"
                   align="center"
                   width="120"
                   label="完成情况">
               </el-table-column>
               <el-table-column
                   prop="timeoutSituation"
-                  sortable="custom"
                   align="center"
                   width="400"
                   label="SOP时间超过法规时限的空档期的业务应对方案">
@@ -232,20 +224,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
         >
         </el-table-column>
         <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 HH:mm:ss") : "" }}</span>