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

src/views/base/workPersonScheduling-change.vue

@@ -104,37 +104,79 @@
             <div class="von-tit">排班规律表</div>
             <ul>
               <li>
-                <a href="#" v-if="showTagNum == 1" class="active" @click="changeTag('1')">一</a>
+                <a
+                  href="#"
+                  v-if="showTagNum == 1"
+                  class="active"
+                  @click="changeTag('1')"
+                  >一</a
+                >
                 <a href="#" v-else @click="changeTag('1')">一</a>
                 <p>{{ number1 }}</p>
               </li>
               <li>
-                <a href="#" v-if="showTagNum == 2" class="active" @click="changeTag('2')">二</a>
+                <a
+                  href="#"
+                  v-if="showTagNum == 2"
+                  class="active"
+                  @click="changeTag('2')"
+                  >二</a
+                >
                 <a href="#" v-else @click="changeTag('2')">二</a>
                 <p>{{ number2 }}</p>
               </li>
               <li>
-                <a href="#" v-if="showTagNum == 3" class="active" @click="changeTag('3')">三</a>
+                <a
+                  href="#"
+                  v-if="showTagNum == 3"
+                  class="active"
+                  @click="changeTag('3')"
+                  >三</a
+                >
                 <a href="#" v-else @click="changeTag('3')">三</a>
                 <p>{{ number3 }}</p>
               </li>
               <li>
-                <a href="#" v-if="showTagNum == 4" class="active" @click="changeTag('4')">四</a>
+                <a
+                  href="#"
+                  v-if="showTagNum == 4"
+                  class="active"
+                  @click="changeTag('4')"
+                  >四</a
+                >
                 <a href="#" v-else @click="changeTag('4')">四</a>
                 <p>{{ number4 }}</p>
               </li>
               <li>
-                <a href="#" v-if="showTagNum == 5" class="active" @click="changeTag('5')">五</a>
+                <a
+                  href="#"
+                  v-if="showTagNum == 5"
+                  class="active"
+                  @click="changeTag('5')"
+                  >五</a
+                >
                 <a href="#" v-else @click="changeTag('5')">五</a>
                 <p>{{ number5 }}</p>
               </li>
               <li>
-                <a href="#" v-if="showTagNum == 6" class="active" @click="changeTag('6')">六</a>
+                <a
+                  href="#"
+                  v-if="showTagNum == 6"
+                  class="active"
+                  @click="changeTag('6')"
+                  >六</a
+                >
                 <a href="#" v-else @click="changeTag('6')">六</a>
                 <p>{{ number6 }}</p>
               </li>
               <li>
-                <a href="#" v-if="showTagNum == 7" class="active" @click="changeTag('7')">七</a>
+                <a
+                  href="#"
+                  v-if="showTagNum == 7"
+                  class="active"
+                  @click="changeTag('7')"
+                  >七</a
+                >
                 <a href="#" v-else @click="changeTag('7')">七</a>
                 <p>{{ number7 }}</p>
               </li>
@@ -142,10 +184,12 @@
           </div>
           <div class="von-right-bot">
             <el-tag
-              v-if="leftClickType && rightClickType"
+              v-for="tag in showWorkTags"
+              :key="tag.number"
+              :value="tag.id"
               closable
-              @close="closeTag()"
-              >{{ showName }}</el-tag
+              @close="closeTag(tag)"
+              >{{ tag.name }}</el-tag
             >
           </div>
         </div>
@@ -220,6 +264,21 @@ export default {
       number7: "无",
       personInfoData: [],
       selectId: "",
+      showWorkTags: [],
+      showWorkTag1: [],
+      showWorkTag2: [],
+      showWorkTag3: [],
+      showWorkTag4: [],
+      showWorkTag5: [],
+      showWorkTag6: [],
+      showWorkTag7: [],
+      numberArray1: [],
+      numberArray2: [],
+      numberArray3: [],
+      numberArray4: [],
+      numberArray5: [],
+      numberArray6: [],
+      numberArray7: [],
     };
   },
   created() {
@@ -275,11 +334,74 @@ export default {
           var formData = new FormData();
           formData.append("startDate", startDate);
           formData.append("endDate", endDate);
-          formData.append("schedulingIds", self.schedulingIds);
+          //formData.append("schedulingIds", self.schedulingIds);
           formData.append("companyId", self.queryModel.companyId);
           formData.append("personId", self.queryModel.personId);
+
           //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++) {
+            self["showWorkTag" + i].forEach((item, index) => {
+              self["numberArray" + i].push(item.id);
+            });
+
+            var num = self["numberArray" + i].join(";");
+            if (num != null && num != "") {
+              self.schedulingIds.push(num);
+            }
+          }
+          // self.showWorkTag1.forEach((item, index) => {
+          //   numberArray1.push(item.id);
+          // });
+
+          // var numberArray2 = [];
+          // self.showWorkTag2.forEach((item, index) => {
+          //   numberArray2.push(item.id);
+          // });
+
+          // var numberArray3 = [];
+          // self.showWorkTag3.forEach((item, index) => {
+          //   numberArray3.push(item.id);
+          // });
+
+          // var numberArray4 = [];
+          // self.showWorkTag4.forEach((item, index) => {
+          //   numberArray4.push(item.id);
+          // });
+
+          // var numberArray5 = [];
+          // self.showWorkTag5.forEach((item, index) => {
+          //   numberArray5.push(item.id);
+          // });
+
+          // var numberArray6 = [];
+          // self.showWorkTag6.forEach((item, index) => {
+          //   numberArray6.push(item.id);
+          // });
+
+          // var numberArray7 = [];
+          // self.showWorkTag7.forEach((item, index) => {
+          //   numberArray7.push(item.id);
+          // });
+
+          // var num1 = numberArray1.join(";");
+          // var num2 = numberArray1.join(";");
+          // self.schedulingIds.push(num1);
+          // self.schedulingIds.push(num1);
+          // self.schedulingIds["3"] = numberArray3;
+          // self.schedulingIds["4"] = numberArray4;
+          // self.schedulingIds["5"] = numberArray5;
+          // self.schedulingIds["6"] = numberArray6;
+          // self.schedulingIds["7"] = numberArray7;
+
+          formData.append("schedulingIds", self.schedulingIds);
           workPersonSchedulingApi
             .changeScheduling(formData)
             .then(function (response) {
@@ -330,53 +452,124 @@ export default {
     },
     changeTag(tagNum) {
       var self = this;
-      this.showTagNum = tagNum;
-      if (self.uploadTags[tagNum] != null) {
-        this.showName = self.uploadTags[tagNum];
-        self.rightClickType = true;
-      } else {
-        self.rightClickType = false;
-        self.leftClickType = true;
-      }
+      self.showTagNum = tagNum;
+
+      var tagsName = "showWorkTag" + self.showTagNum;
+      self.showWorkTags = this[tagsName];
+
+      // if (self.uploadTags[tagNum] != null) {
+      //   this.showName = self.uploadTags[tagNum];
+      //   self.rightClickType = true;
+      // } else {
+      //   self.rightClickType = false;
+      //   self.leftClickType = true;
+      // }
     },
     handleCurrentChange(val) {
       this.currentRow = val;
     },
     moveUp() {
-      if (this.currentRow != "" && this.currentRow != null) {
-        if (this.showTagNum != "" && this.showTagNum != null) {
-          this.showId = this.currentRow.id;
-          this.showName = this.currentRow.name;
-          this.showNumber = this.currentRow.number;
-          this.leftClickType = true;
-          this.rightClickType = true;
-          this.uploadTags[this.showTagNum] = this.showName;
-          this.schedulingIds[this.showTagNum] = this.showId;
-          var numberName = "number" + this.showTagNum;
-          this[numberName] = this.showNumber;
-          this.selectId = this.currentRow.id;
+      var self = this;
+      if (this.currentRow != "" && self.currentRow != null) {
+        var flag = true;
+        if (this.showWorkTags != null) {
+          this.showWorkTags.forEach((item, index) => {
+            if (item.id == self.currentRow.id) {
+              flag = false;
+            }
+          });
+        }
+
+        if (flag) {
+          var tag = {
+            id: self.currentRow.id,
+            number: self.currentRow.number,
+            name: self.currentRow.name,
+          };
+          var tagsName = "showWorkTag" + self.showTagNum;
+          self.showWorkTags.push(tag);
+          self[tagsName] = self.showWorkTags;
+          var numberName = "number" + self.showTagNum;
+
+          var nums = [];
+          self.showWorkTags.forEach((item, index) => {
+            nums.push(item.number);
+          });
+
+          var num = nums.join(",");
+          self[numberName] = num;
+
+          //self.showId = self.currentRow.id + ",";
+
+          //self.schedulingIds[self.showTagNum] = self.showWorkTags;
         }
+
+        // if (this.showTagNum != "" && self.showTagNum != null) {
+        //   self.showId = self.currentRow.id;
+        //   self.showName = self.currentRow.name;
+        //   self.showNumber = self.currentRow.number;
+        //   self.leftClickType = true;
+        //   self.rightClickType = true;
+        //   self.uploadTags[this.showTagNum] = self.showName;
+        //   self.schedulingIds[this.showTagNum] = self.showId;
+        //   var numberName = "number" + self.showTagNum;
+        //   self[numberName] = self.showNumber;
+        //   self.selectId = self.currentRow.id;
+        //   var tag = {
+        //     id: self.currentRow.id,
+        //     number: self.currentRow.number,
+        //     name: self.currentRow.name,
+        //   };
+        //   self.showWorkTags.push(tag);
+        // }
       }
     },
     moveDown() {
-      if (this.showTagNum != "" && this.showTagNum != null) {
-        this.uploadTags[this.showTagNum] = null;
-        this.schedulingIds[this.showTagNum] = null;
-        this.rightClickType = false;
-        var numberName = "number" + this.showTagNum;
-        this[numberName] = "0";
-        this.selectId = "";
+      var self = this;
+      // if (this.showTagNum != "" && this.showTagNum != null) {
+      //   this.uploadTags[this.showTagNum] = null;
+      //   this.schedulingIds[this.showTagNum] = null;
+      //   this.rightClickType = false;
+      //   var numberName = "number" + this.showTagNum;
+      //   this[numberName] = "0";
+      //   this.selectId = "";
+
+      //   var tag = {
+      //     id: self.currentRow.id,
+      //     number: self.currentRow.number,
+      //     name: self.currentRow.name,
+      //   };
+      //   self.showWorkTags.splice(tag, 1);
+      // }
+
+      if (this.currentRow != "" && self.currentRow != null) {
+        if (self.showWorkTags != null) {
+          var tag = {
+            id: self.currentRow.id,
+            number: self.currentRow.number,
+            name: self.currentRow.name,
+          };
+          this.showWorkTags.splice(this.showWorkTags.indexOf(tag), 1);
+
+          var tagsName = "showWorkTag" + self.showTagNum;
+          this.showWorkTags.splice(this.showWorkTags.indexOf(tag), 1);
+          this.self[tagsName].splice(this.showWorkTags.indexOf(tag), 1);
+        }
       }
     },
-    closeTag() {
-      if (this.showTagNum != "" && this.showTagNum != null) {
-        this.uploadTags[this.showTagNum] = null;
-        this.schedulingIds[this.showTagNum] = null;
-        this.rightClickType = false;
-        var numberName = "number" + this.showTagNum;
-        this[numberName] = "0";
-        this.selectId = "";
+    closeTag(tag) {
+      if (this.showWorkTags != null) {
+        this.showWorkTags.splice(this.showWorkTags.indexOf(tag), 1);
       }
+
+      // if (this.showTagNum != "" && this.showTagNum != null) {
+      //   this.uploadTags[this.showTagNum] = null;
+      //   this.schedulingIds[this.showTagNum] = null;
+      //   this.rightClickType = false;
+      //   var numberName = "number" + this.showTagNum;
+      //   this[numberName] = "0";
+      //   this.selectId = "";
+      // }
     },
     selectShift(shift) {
       this.currentRow = shift;