Merge branch 'master' of http://47.92.161.104:10080/shuzhan/shinestar-portal

src/App.vue

@@ -73,4 +73,14 @@ body{
     margin-left: 0px;
   }
 }
+
+
+.inline{
+  display:inline;
+}
+
+.margin-10{
+  margin-left:10px;
+  margin-right:10px;
+}
 </style>

src/views/base/companyInfo-department-list.vue

@@ -123,6 +123,9 @@
         @click="handleAdd"
         >新增</el-button
       >
+      <permission-detect 
+        class="inline margin-10"
+        path="/base/companyInfo/delete" method="post">
       <el-button
         type="primary"
         size="small"
@@ -132,6 +135,7 @@
         @click="handleBatchDelete"
         >删除选中项</el-button
       >
+      </permission-detect>
       <el-button
         type="primary"
         size="small"
@@ -219,12 +223,15 @@
                 @click="handleEdit(row)"
                 >编辑</el-link
               >-
+              <permission-detect class="inline"
+                path="/base/companyInfo/delete" method="post">
               <el-link
                 type="danger"
                 :underline="false"
                 @click="handleDelete(row)"
                 >删除</el-link
               >-
+              </permission-detect>
               <el-link
                 type="primary"
                 :underline="false"

src/views/base/companyInfo-list.vue

@@ -122,16 +122,19 @@
         icon="el-icon-circle-plus"
         @click="handleAdd"
         >新增</el-button
-      >
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-remove"
-        :disabled="multipleSelection.length == 0"
-        @click="handleBatchDelete"
-        >删除选中项</el-button
-      >
+      >      
+      <permission-detect 
+        class="inline margin-10"
+        path="/base/companyInfo/delete" method="post">
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-remove"
+          :disabled="multipleSelection.length == 0"
+          @click="handleBatchDelete"
+          >删除选中项</el-button>
+      </permission-detect>
       <el-button
         type="primary"
         size="small"
@@ -219,12 +222,15 @@
                 @click="handleEdit(row)"
                 >编辑</el-link
               >-
+              <permission-detect class="inline"
+                path="/base/companyInfo/delete" method="post">
               <el-link
                 type="danger"
                 :underline="false"
                 @click="handleDelete(row)"
                 >删除</el-link
               >-
+              </permission-detect>
               <el-link
                 type="primary"
                 :underline="false"

src/views/base/personInfo-list.vue

@@ -1895,13 +1895,4 @@ export default {
 .sticky-panel {
   background-color: #fff;
 }
-
-.inline{
-  display:inline;
-}
-
-.margin-10{
-  margin-left:10px;
-  margin-right:10px;
-}
 </style>

src/views/base/workPersonScheduling-change.vue

@@ -180,6 +180,28 @@
                 <a href="#" v-else @click="changeTag('7')">七</a>
                 <p>{{ number7 }}</p>
               </li>
+              <li>
+                <a
+                  href="#"
+                  v-if="showTagNum == 8"
+                  class="active"
+                  @click="changeTag('8')"
+                  >八</a
+                >
+                <a href="#" v-else @click="changeTag('8')">八</a>
+                <p>{{ number8 }}</p>
+              </li>
+              <li>
+                <a
+                  href="#"
+                  v-if="showTagNum == 9"
+                  class="active"
+                  @click="changeTag('9')"
+                  >九</a
+                >
+                <a href="#" v-else @click="changeTag('9')">九</a>
+                <p>{{ number9 }}</p>
+              </li>
             </ul>
           </div>
           <div class="von-right-bot">
@@ -262,6 +284,8 @@ export default {
       number5: "无",
       number6: "无",
       number7: "无",
+      number8: "无",
+      number9: "无",
       personInfoData: [],
       selectId: "",
       showWorkTags: [],
@@ -272,6 +296,8 @@ export default {
       showWorkTag5: [],
       showWorkTag6: [],
       showWorkTag7: [],
+      showWorkTag8: [],
+      showWorkTag9: [],
       numberArray1: [],
       numberArray2: [],
       numberArray3: [],
@@ -279,6 +305,8 @@ export default {
       numberArray5: [],
       numberArray6: [],
       numberArray7: [],
+      numberArray8: [],
+      numberArray9: [],
     };
   },
   created() {
@@ -340,14 +368,7 @@ export default {
 
           //formData.append("companyId", "ee25ae8d-d102-4fcd-8d58-71e40f413337");
 
-          var numberArray1 = [];
-          var numberArray2 = [];
-          var numberArray3 = [];
-          var numberArray4 = [];
-          var numberArray5 = [];
-          var numberArray6 = [];
-          var numberArray7 = [];
-          for (var i = 1; i < 8; i++) {
+          for (var i = 1; i <= 9; i++) {
             self["showWorkTag" + i].forEach((item, index) => {
               self["numberArray" + i].push(item.id);
             });
@@ -626,11 +647,14 @@ body {
   height: 332px;
   justify-content: space-between;
 }
-.von-left,
-.von-right {
+.von-left {
   height: 100%;
   width: 40%;
 }
+.von-right {
+  height: 100%;
+  width: 60%;
+}
 .von-left,
 .von-right-top,
 .von-right-bot {

src/views/base/workShiftInfo-list.vue

@@ -50,15 +50,19 @@
         @click="handleAdd"
         >新增</el-button
       >
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-remove"
-        :disabled="multipleSelection.length == 0"
-        @click="handleBatchDelete"
-        >删除选中项</el-button
-      >
+      <permission-detect 
+      class="inline margin-10"
+      path="/base/workShiftInfo/delete" method="post">
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-remove"
+          :disabled="multipleSelection.length == 0"
+          @click="handleBatchDelete"
+          >删除选中项
+        </el-button>
+      </permission-detect>
     </el-row>
     <el-table
       ref="formTable"
@@ -127,7 +131,15 @@
               <el-link type="primary" @click="handleEdit(row)">编辑</el-link>
             </el-col>
             <el-col :span="8">
-              <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+              <permission-detect class="inline"
+                  path="/base/workShiftInfo/delete" method="post">
+                  <el-link
+                    type="danger"
+                    :underline="false"
+                    @click="handleDelete(row)"
+                    >删除
+                  </el-link>
+                </permission-detect>
             </el-col>
           </el-row>
         </template>

src/views/business/workScheduleAttendance-list.vue

@@ -417,7 +417,7 @@ export default {
 
       this.$store
         .dispatch("tagsView/delView", {
-          name: "BusRouteInfoList",
+          name: "BusinessWorkScheduleAttendanceDayList",
           path: path,
         })
         .then(({ visitedViews }) => {