上架后可以改变顺序

package-lock.json

@@ -2568,7 +2568,7 @@
     },
     "extract-text-webpack-plugin": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-1.0.1.tgz",
+      "resolved": "http://192.168.110.93:4873/extract-text-webpack-plugin/-/extract-text-webpack-plugin-1.0.1.tgz",
       "integrity": "sha1-yVvzy6rEnclvHcbgclSfu2VMzSw=",
       "dev": true,
       "requires": {
@@ -9121,7 +9121,7 @@
     },
     "webpack-sources": {
       "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz",
+      "resolved": "http://192.168.110.93:4873/webpack-sources/-/webpack-sources-0.1.5.tgz",
       "integrity": "sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=",
       "dev": true,
       "requires": {

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = '75E66BEF653E4DFB9F54209901EA76AD';
+      config.headers['token'] = 'D2E29BE9FF794703A482518A04D344E2';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/views/education/add-manager.vue

@@ -1389,6 +1389,7 @@ export default {
         this.getDepartment();
       } else if (active == 2) {
         this.stepData = [false, false, true];
+        this.tagDrop();
       }
     },
     //点击暂存
@@ -1491,11 +1492,11 @@ export default {
     //点击完成
     complete() {
       //type 1:暂存 2：完成
-      if (this.status4Flag == 1) {
-        vm.$message.info("完成");
-        vm.$router.push({ path: "item-manager" });
-        return;
-      }
+      // if (this.status4Flag == 1) {
+      //   vm.$message.info("完成");
+      //   vm.$router.push({ path: "item-manager" });
+      //   return;
+      // }
       let formName = "formComponent";
       let completeState = this.submitForm(formName);
       let certificateState = this.checkCertificate();
@@ -1571,6 +1572,7 @@ export default {
               if (res.code == "000000") {
                 this.active++;
                 this.stepData = [false, false, true];
+                this.tagDrop();
               }
             }
           );
@@ -1620,6 +1622,7 @@ export default {
                 if(statusMove === 0) { 
                   this.active++;
                   this.stepData = [false, false, true];
+                  this.tagDrop();
                 } else {
                   console.log('不能改变范围status：'+res.data.status)
                 }
@@ -1669,6 +1672,7 @@ export default {
               if(statusMove === 0) { 
                 this.active++;
                 this.stepData = [false, false, true];
+                this.tagDrop();
               } else {
                 console.log('不能改变范围status：'+res.data.status)
               }
@@ -3135,9 +3139,7 @@ export default {
         }
       }
       //console.log('this.tagsComponent',this.tagsComponent);
-      if(vm.tagsComponent.length > 0) {
-        vm.tagDrop();
-      }
+      vm.tagDrop();
     },
     initTags(value) {
       //console.log('value',value,'optionsComponent',this.optionsComponent);
@@ -3154,9 +3156,9 @@ export default {
         }
       }
       //console.log('this.tagsComponent',this.tagsComponent);
-      if(vm.tagsComponent.length > 0) {
-        vm.tagDrop();
-      }
+      // if(vm.tagsComponent.length > 0) {
+      //   vm.tagDrop();
+      // }
     },
     //选择组件数据绑定
     handleCloseComponent(tag) {
@@ -3370,15 +3372,19 @@ export default {
       vm.visibleName = false;
     },
     tagDrop() {
-      const ele = document.querySelector('.check-component .el-col-20');
-      // console.log('ele',ele);
-      // Sortable.create(ele,{});
-      Sortable.create(ele, {
-        onEnd({ newIndex, oldIndex }) {
-          const currRow = vm.tagsComponent.splice(oldIndex, 1)[0]
-          vm.tagsComponent.splice(newIndex, 0, currRow)
-        }
-      })
+      this.$nextTick(function() {
+        if(vm.tagsComponent.length > 0) {
+          const ele = document.querySelector('.check-component .el-col-20');
+          // console.log('ele',ele);
+          // Sortable.create(ele,{});
+          Sortable.create(ele, {
+            onEnd({ newIndex, oldIndex }) {
+              const currRow = vm.tagsComponent.splice(oldIndex, 1)[0]
+              vm.tagsComponent.splice(newIndex, 0, currRow)
+            }
+          })
+        }
+      });
     },
   }
 };

src/views/system/item-role.vue

@@ -109,12 +109,22 @@
         ></el-pagination>
       </div>
       <el-dialog title :visible.sync="dialog.show" width="30%" center>
-        <p v-if="numL3 > 1" class="dialog-p">
+        <!-- <p v-if="numL3 > 1" class="dialog-p">
           确认将{{ dialog.role }}
           <span class="user-name">"{{ dialog.name }}"</span>
           {{ dialog.option }}吗?"
         </p>
-        <p v-else >该用户为此机构仅有的次级负责人，确认需要降级吗？</p>
+        <p v-else >该用户为此机构仅有的次级负责人，确认需要降级吗？</p> -->
+
+        <p v-if="numL3 <= 1 && scopeRow.projeceRole == 'L3'" class="dialog-p">
+          该用户为此机构仅有的次级负责人，确认需要降级吗？
+        </p>
+        <p v-else>
+          确认将{{ dialog.role }}
+          <span class="user-name">"{{ dialog.name }}"</span>
+          {{ dialog.option }}吗?"
+        </p>
+
         <span slot="footer" class="dialog-footer">
           <el-button type="default" size="small" @click="dialog.show = false">取消</el-button>
           <el-button type="primary" size="small" @click="changeRole()">确定</el-button>