Merge branch 'qin_24'

# Conflicts:
#	src/views/hr/company/savePage.vue

src/views/hr/company/companyduty copy.vue

@@ -36,10 +36,19 @@ const initInfo = () => {
   companyDutyInit().then((res: any) => {
     console.log("初始化数据：", res.data);
     initConter.value = res.data;
+
     getOrgList(res.data.currentOrg, res.data.year, res.data.month);
   });
 };
-
+//判读那是否显示
+const isShowOrg = (item: any) => {
+  let showOrg = [296, 389, 401, 309];
+  console.log("判读那是否显示", item);
+  if (item && showOrg.includes(item.id)) {
+    return true;
+  }
+  // return true
+};
 //获取行政组织列表
 const getOrgList = (orgid: any, years: any, months: any) => {
   getYearMonthWorkMan({

src/views/hr/company/companyduty.vue

@@ -29,6 +29,8 @@ const saveInfo = reactive({
   night: [],
   years: 2025,
   isCompany: 0,
+  morning: [],
+  afternoon: [],
 });
 const initInfo = () => {
   companyDutyInit().then((res: any) => {
@@ -76,6 +78,8 @@ const saveData = (ord: any, val: any) => {
   saveInfo.night = val.night ? val.night : [];
   saveInfo.years = val.years ? val.years : 2025;
   saveInfo.isCompany = ord.isCompany ? ord.isCompany : 0;
+  saveInfo.morning = val.morning ? val.morning : [];
+  saveInfo.afternoon = val.afternoon ? val.afternoon : [];
   saveOpen.value = true;
   console.log("编辑数据", saveInfo);
 };
@@ -106,6 +110,15 @@ watch(
     deep: true,
   }
 );
+//判读那是否显示
+const isShowOrg = (item: any) => {
+  let showOrg = [296, 389, 401, 309];
+  console.log("判读那是否显示", item);
+  if (item && showOrg.includes(item.id)) {
+    return true;
+  }
+  // return true
+};
 </script>
 <template>
   <div class="comBox">
@@ -167,7 +180,7 @@ watch(
                   style="vertical-align: bottom"
                 >
                   <div v-if="us.holiday == 1">
-                    <el-divider v-if="us.baiTian">白天</el-divider>
+                    <el-divider v-if="us.baiTian">长白</el-divider>
                     <el-space wrap>
                       <el-tag
                         v-for="(mItem, mi) in us.baiTian"
@@ -196,6 +209,7 @@ watch(
                     </el-space>
                   </div>
                   <div v-else>
+                    <el-divider v-if="us.morning">值班</el-divider>
                     <el-space wrap>
                       <el-tag
                         v-for="(mItem, mi) in us.allDay"
@@ -205,7 +219,27 @@ watch(
                       >
                     </el-space>
                   </div>
+                  <div>
+                    <el-divider v-if="us.morning">上午</el-divider>
+                    <el-space wrap>
+                      <el-tag
+                        v-for="(mItem, mi) in us.morning"
+                        closable
+                        @close="delTag()"
+                        >{{ mItem.name }}</el-tag
+                      >
+                    </el-space>
 
+                    <el-divider v-if="us.afternoon">下午</el-divider>
+                    <el-space wrap>
+                      <el-tag
+                        v-for="(mItem, mi) in us.afternoon"
+                        closable
+                        @close="delTag()"
+                        >{{ mItem.name }}</el-tag
+                      >
+                    </el-space>
+                  </div>
                   <div class="butBox">
                     <el-button
                       type="primary"

src/views/hr/company/savePage.vue

@@ -64,8 +64,8 @@ const getOrgPeople = () => {
       saveInfo.value.allDay = res.data.allDayAry;
       saveInfo.value.baiTian = res.data.baiTianAry;
       saveInfo.value.night = res.data.nightAry;
-      saveInfo.value.morning = res.data.morning;
-      saveInfo.value.afternoon = res.data.afternoon;
+      saveInfo.value.morning = res.data.morningAry;
+      saveInfo.value.afternoon = res.data.afternoonAry;
       saveInfo.value.isCompany = 1;
     })
     .finally(() => {
@@ -100,6 +100,7 @@ const getOrgPeople = () => {
       }
     });
 };
+
 //提交数据
 const saveCenter = () => {
   console.log("提交数据", saveInfo.value);
@@ -141,9 +142,10 @@ const orgTreeProps = {
           inactive-value="2"
           active-text="是"
           inactive-text="否"
+          v-loading="loading"
         />
       </el-form-item>
-      <el-form-item v-if="saveInfo.holiday == 1" label="白天" prop="baiTian">
+      <el-form-item v-show="saveInfo.holiday == 1" label="长白" prop="baiTian">
         <el-tree-select
           v-if="saveInfo.isCompany == 1"
           v-model="saveInfo.baiTian"
@@ -171,7 +173,7 @@ const orgTreeProps = {
           v-loading="loading"
         />
       </el-form-item>
-      <el-form-item v-if="saveInfo.holiday == 1" label="夜晚" prop="night">
+      <el-form-item v-show="saveInfo.holiday == 1" label="夜晚" prop="night">
         <el-tree-select
           v-if="saveInfo.isCompany == 1"
           v-model="saveInfo.night"
@@ -199,7 +201,7 @@ const orgTreeProps = {
           v-loading="loading"
         />
       </el-form-item>
-      <el-form-item v-else label="值班" prop="allDay">
+      <el-form-item v-show="saveInfo.holiday != 1" label="值班" prop="allDay">
         <el-tree-select
           v-if="saveInfo.isCompany == 1"
           v-model="saveInfo.allDay"
@@ -256,7 +258,7 @@ const orgTreeProps = {
           v-loading="loading"
         />
       </el-form-item>
-      <el-form-item label="上午" prop="afternoon">
+      <el-form-item label="下午" prop="afternoon">
         <el-tree-select
           v-if="saveInfo.isCompany == 1"
           v-model="saveInfo.afternoon"