Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

src/views/core/outIn/letter/dialog.addletter.vue

@@ -68,6 +68,7 @@
                   ref="uploadFile"
                   :limit=2
                   :defaultValue="formFileListDefualtValue"
+                  :fileType="letterFileType"
                   @input="fileListChanged"
                   v-model="formData.letterFile"
                 />
@@ -239,6 +240,7 @@ export default {
       open: false,
       userInfo: this.resetUserInfo(),
       imageList: [],
+      letterFileType:["pdf", "jpg", "png", "bmp"]
     };
   },
   dicts: ["letter_status","letter_id_type"],

src/views/resumption/plan/index.vue

@@ -460,7 +460,7 @@ export default {
     //   }
     //   return false;
     // },
-    showPublish(row) {
+    showPublish(row) {      
       //有父计划且父计划不是使用中状态，不能下发
       if (row.parentStatus != 1 && row.parentId>0) {
         return false;
@@ -486,7 +486,7 @@ export default {
     },
     showDelete(row) {
       //本机构创建的计划，才能删除
-      return row.planCreateOrgId == this.orgId;
+      return row.planCreateOrgId == this.orgId && row.planOfOrgId==this.orgId;
     },
     showWithDraw(row) {
       //本机构创建是自己+状态为使用中

src/views/safetycheck/plan/dialog.edit.vue

@@ -116,7 +116,7 @@
                   clearable
                 >
                   <el-option
-                    v-for="item in dict.type.sys_org_type"
+                    v-for="item in orgTypeOptions"
                     :key="item.value"
                     :label="item.label"
                     :value="parseInt(item.value)"
@@ -135,6 +135,7 @@
                   placeholder="请选择检查人员"
                   multiple
                   filterable
+                  collapse-tags
                   @change="handleRolesChange"
                 >
                   <el-option
@@ -158,6 +159,7 @@
                   placeholder="请选择受检机构类型"
                   clearable
                   multiple
+                  collapse-tags
                 >
                   <el-option
                     v-for="item in orgTypeOptions"
@@ -172,6 +174,7 @@
             <el-col :span="6">
               <el-form-item prop="count" label="任务次数:">
                 <el-input-number
+                  :disabled="cannotEdit()"
                   style="margin-left: 10px"
                   v-model="formData.count"
                   controls-position="right"
@@ -199,9 +202,15 @@
                 <org-tree-select
                   :disabled="cannotEdit()"
                   v-model="formData.checkOrgIds"
-                  :queryData="parseInt(formData.checkOrgType)"
                   ref="checkorgTreeSelect"
-                  :enabledCheckOrgTypes="parseInt(formData.checkOrgType)"
+                  :queryData="
+                    (formData.checkOrgTypes==null || formData.checkOrgTypes.length > 1)
+                      ? null
+                      : parseInt(formData.checkOrgTypes[0])
+                  "
+                  :enabledCheckOrgTypes="
+                    formData.checkOrgTypes.map((t) => parseInt(t))
+                  "
                   :disable="true"
                 >
                 </org-tree-select>
@@ -320,8 +329,11 @@
           </el-table-column>
         </el-table>
       </div>
-
-      <div slot="footer" class="dialog-footer">
+      <div v-if="formData.planCycle==6 && formData.taskHasCompleted==1" slot="footer" class="dialog-footer">    
+        <span>存在已完成任务，无周期任务如需修改，请删除后重新下发。</span>
+        <el-button @click="onHide">关闭</el-button>
+      </div>
+      <div v-else slot="footer" class="dialog-footer">        
         <el-button type="primary" @click="onSubmit">确定</el-button>
         <el-button @click="onHide">取消</el-button>
       </div>
@@ -561,6 +573,10 @@ export default {
         return false;
       }
 
+      if(this.formData.planCycle==6 && this.formData.taskHasCompleted==1){
+        return true;
+      }
+
       if (this.formData.planOfOrgId != this.orgId) {
         return true;
       }
@@ -575,6 +591,10 @@ export default {
         return false;
       }
 
+      if(this.formData.planCycle==6 && this.formData.taskHasCompleted==1){
+        return true;
+      }
+
       let r =
         this.formData.planOfOrgId != this.orgId ||
         this.formData.planCreateOrgId != this.orgId;

src/views/safetycheck/plan/distribute.vue

@@ -97,7 +97,7 @@ export default {
           this.info.orgAndStatus = r.data.map((d) => {
             return { orgId: d.id, orgName: d.shortName, status: "1" };
           });
-          this.$emit("select", this.info);
+          this.$emit("select", this.info, plan);
         } else {
           this.isShow = true;
           listByTypes({

src/views/safetycheck/plan/index.vue

@@ -482,13 +482,15 @@ export default {
   computed: {
     ...mapState([]),
     ...mapGetters(["orgId", "orgName"]),
-    orgTypeOptions(){
-     if(!this.dict || !this.dict.type.sys_org_type==null)  {
-      return []
-     }
-     
-     return this.dict.type.sys_org_type.filter(t=>!["7","8"].includes(t.value))
-    }
+    orgTypeOptions() {
+      if (!this.dict || !this.dict.type.sys_org_type == null) {
+        return [];
+      }
+
+      return this.dict.type.sys_org_type.filter(
+        (t) => !["7", "8"].includes(t.value)
+      );
+    },
   },
   methods: {
     ...mapMutations([]),
@@ -511,8 +513,8 @@ export default {
       //行社的计划，或检查机构类型是省联社、办事处，走单个下发
       if (
         row.planOfOrgType == 3 ||
-        row.checkOrgType == 1 ||
-        row.checkOrgType == 2
+        row.execOrgType == 1 ||
+        row.execOrgType == 2
       ) {
         this.onSinglePlanDistribute(row);
       } else {
@@ -524,7 +526,7 @@ export default {
       if (row.planStatus == 0) {
         if (row.planCycle == 6) {
           //无周期任务,
-          let msg = "无周期任务下发后将立即生成任务,确定下发?";
+          let msg = "确定下发任务并立即生成任务?";
           this.$modal.confirm(msg).then(() => {
             this.distributeSingle(row.id, true);
           });
@@ -609,7 +611,7 @@ export default {
     },
     showDelete(row) {
       //本机构创建的计划，才能删除
-      return row.planCreateOrgId == this.orgId;
+      return row.planCreateOrgId == this.orgId && row.planOfOrgId == this.orgId;
     },
     showWithDraw(row) {
       //本机构创建是自己+状态为使用中
@@ -641,7 +643,7 @@ export default {
       if (row.planStatus == 0) {
         if (row.planCycle == 6) {
           //无周期任务,
-          let msg = "无周期任务下发后将立即生成任务,确定下发?";
+          let msg = "确定下发任务并立即生成任务?";
           this.$modal.confirm(msg).then(() => {
             this.distributeInner(selectList, true);
           });
@@ -667,11 +669,9 @@ export default {
         } else {
           msg = "因存在已完成任务，是否确定从下周期生成任务？";
         }
-        this.$modal
-          .confirm(msg)
-          .then(() => {
-            this.distributeInner(selectList, false);
-          });
+        this.$modal.confirm(msg).then(() => {
+          this.distributeInner(selectList, false);
+        });
       } else {
         this.distributeInner(selectList, false);
       }
@@ -691,9 +691,16 @@ export default {
 
     //开始撤回
     chhuile(row) {
+      if (row.planCycle == "6" && row.taskHasCompleted == 1) {
+        //无周期任务有已完成时，不能撤回
+        this.$modal.alertSuccess(
+          "存在已完成任务，无周期任务不允许撤回，如需删除下发任务请点击“删除”。"
+        );
+        return;
+      }
       let msg;
-      
-      if (row.taskHasCompleted != 1) {        
+
+      if (row.taskHasCompleted != 1) {
         msg = "因不存在已完成任务，撤回后将删除所有生成任务?";
       } else {
         msg = "因存在已完成任务，撤回后下周期起将不再生成任务?";
@@ -764,18 +771,10 @@ export default {
       if (row.planStatus == 0) {
         msg = '是否确认删除名称为"' + row.planName + '"的任务？';
       } else if (row.planStatus == 1) {
-        if (row.planCycle == 1) {
-          msg = "本次删除将强制删除今日所有任务?";
-        } else {
-          msg = "本次删除将强制删除当前任务时间及以后所有任务";
-        }
+        msg = "本次删除将强制删除当前任务时间及以后所有任务";
       } else if (row.planStatus == 2) {
         if (row.hasTaskCurrentCycle) {
-          if (row.planCycle == 1) {
-            msg = "本次删除将强制删除今日所有任务?";
-          } else {
-            msg = "本次删除将强制删除当前任务时间及以后所有任务";
-          }
+          msg = "本次删除将强制删除当前任务时间及以后所有任务";
         } else {
           msg = '是否确认删除名称为"' + row.planName + '"的任务？';
         }
@@ -799,7 +798,7 @@ export default {
             });
         })
         .catch((ex) => {
-          console.error(ex)
+          console.error(ex);
           // 用户点击了取消按钮
           // console.log("取消操作...");
         });

src/views/system/workTimeSet/dialog.add.vue

@@ -1,189 +1,208 @@
 <template>
   <div class="question-infos">
-    <DialogCom title="新增作息" @close="handleClose" :visible.sync="isShow" :close-on-click-modal="false"
-      custom-class="gxDialog" width="1320px" append-to-body>
-<!--      <div class="p-5 work-time">-->
-        <el-form label-width="90px" label-suffix="" label-position="right">
-
-          <el-form-item label="分配机构">
-            <org-tree-select ref="orgTreeSelect" :checkShow="true"  v-model="orgIdList"></org-tree-select>
-          </el-form-item >
-          <el-form-item label="调整日期">
-            <el-button type="primary" @click="addData">新增日期</el-button>
-          </el-form-item>
-          <!--  -->
-          <el-form-item label="作息规则">
-            <el-table class="w-auto" height="350" border :data="workTimeList">
-              <el-table-column label="日期" width="160" align="center">
-                <template slot-scope="r" >
-                  <el-date-picker
+    <DialogCom
+      title="新增作息"
+      @close="handleClose"
+      :visible.sync="isShow"
+      :close-on-click-modal="false"
+      custom-class="gxDialog"
+      width="1320px"
+      append-to-body
+    >
+      <!--      <div class="p-5 work-time">-->
+      <el-form label-width="90px" label-suffix="" label-position="right">
+        <el-form-item label="分配机构">
+          <org-tree-select
+            ref="orgTreeSelect"
+            :checkShow="true"
+            v-model="orgIdList"
+          ></org-tree-select>
+        </el-form-item>
+        <el-form-item label="调整日期">
+          <el-button type="primary" @click="addData">新增日期</el-button>
+        </el-form-item>
+        <!--  -->
+        <el-form-item label="作息规则">
+          <el-table class="w-auto" height="350" border :data="workTimeList">
+            <el-table-column label="日期" width="160" align="center">
+              <template slot-scope="r">
+                <el-date-picker
                   :default-timezone="'GMT+8'"
-                    style="width: 100%"
-                    v-model="r.row.ymdDate"
-                    size="mini"
-                    :clearable=false
-                    popper-class="no-atTheMoment"
-                    :picker-options="startDatepickerOptions"
-                    type="date"
-                    placeholder="请选择日期">
-                  </el-date-picker>
-                </template>
-              </el-table-column>
-              <el-table-column label="星期" width="80" align="center">
-                <template slot-scope="r">
-                  <span>{{parseTime(r.row.ymdDate ,'dddd')}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="状态" width="160" align="center">
-                <template slot-scope="r">
-<!--                  <el-switch-->
-<!--                  v-model="r.row.isEnable"-->
-<!--                  :active-value="1"-->
-<!--                  :inactive-value="0"-->
-<!--                  @change="onEnableChange(r.row)"-->
-<!--                  active-text="营业"-->
-<!--                  inactive-text="歇业">-->
-<!--                </el-switch>-->
+                  style="width: 100%"
+                  v-model="r.row.ymdDate"
+                  size="mini"
+                  :clearable="false"
+                  popper-class="no-atTheMoment"
+                  :picker-options="startDatepickerOptions"
+                  type="date"
+                  placeholder="请选择日期"
+                >
+                </el-date-picker>
+              </template>
+            </el-table-column>
+            <el-table-column label="星期" width="80" align="center">
+              <template slot-scope="r">
+                <span>{{ parseTime(r.row.ymdDate, "dddd") }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" width="160" align="center">
+              <template slot-scope="r">
+                <!--                  <el-switch-->
+                <!--                  v-model="r.row.isEnable"-->
+                <!--                  :active-value="1"-->
+                <!--                  :inactive-value="0"-->
+                <!--                  @change="onEnableChange(r.row)"-->
+                <!--                  active-text="营业"-->
+                <!--                  inactive-text="歇业">-->
+                <!--                </el-switch>-->
 
-                  <el-radio-group
-                      :disabled="r.row.disabled"
-                      v-model="r.row.isEnable"
-                      @change="onEnableChange(r.row)">
-                    <el-radio text-color="#48bb78" :label="1">营业</el-radio>
-                    <el-radio text-color="#f56565" :label="0">歇业</el-radio>
-                  </el-radio-group>
-                </template>
-              </el-table-column>
-              <el-table-column label="是否值班打卡" width="160" align="center">
-                <template slot-scope="r">
-                  <el-switch
+                <el-radio-group
+                  :disabled="r.row.disabled"
+                  v-model="r.row.isEnable"
+                  @change="onEnableChange(r.row)"
+                >
+                  <el-radio text-color="#48bb78" :label="1">营业</el-radio>
+                  <el-radio text-color="#f56565" :label="0">歇业</el-radio>
+                </el-radio-group>
+              </template>
+            </el-table-column>
+            <el-table-column label="是否值班打卡" width="160" align="center">
+              <template slot-scope="r">
+                <el-switch
                   v-model="r.row.isDuty"
                   :active-value="1"
                   :inactive-value="0"
                   @change="onEnableChange(r.row)"
                   active-text="是"
-                  inactive-text="否">
+                  inactive-text="否"
+                >
                 </el-switch>
 
-<!--                  <el-radio-group-->
-<!--                    :disabled="r.row.disabled"-->
-<!--                    v-model="r.row.isEnable"-->
-<!--                    @change="onEnableChange(r.row)">-->
-<!--                    <el-radio text-color="#48bb78" :label="1">营业</el-radio>-->
-<!--                    <el-radio text-color="#f56565" :label="0">歇业</el-radio>-->
-<!--                  </el-radio-group>-->
-                </template>
-              </el-table-column>
-              <el-table-column label="上班时间" width="120" align="center">
-                <template slot-scope="r">
-                  <el-time-select
-                    style="width: 100%"
-                    size="mini"
-                    :picker-options="pickerOptions"
-                    :disabled="r.row.disabled || !r.row.isEnable"
-                    v-model="r.row.workTime"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="营业开始" width="120" align="center">
-                <template slot-scope="r">
-                  <el-time-select
-                    style="width: 100%;"
-                    size="mini"
-                    :picker-options="pickerOptions"
-                    :disabled="r.row.disabled || !r.row.isEnable"
-                    v-model="r.row.openTime"/>
-                </template>
-              </el-table-column>
-<!--              <el-table-column label="午休开始">-->
-<!--                <template slot-scope="r">-->
-<!--                  <el-time-select-->
-<!--                    style="width: 100%"-->
-<!--                    size="mini"-->
-<!--                    :picker-options="pickerOptions"-->
-<!--                    :disabled="r.row.disabled || !r.row.isEnable"-->
-<!--                    v-model="r.row.noonbreakStart"/>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column label="午休结束">-->
-<!--                <template slot-scope="r">-->
-<!--                  <el-time-select-->
-<!--                    style="width: 100%"-->
-<!--                    size="mini"-->
-<!--                    :picker-options="pickerOptions"-->
-<!--                    :disabled="r.row.disabled || !r.row.isEnable"-->
-<!--                    v-model="r.row.noonbreakEnd"/>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-              <el-table-column label="营业结束" width="120" align="center">
-                <template slot-scope="r">
-                  <el-time-select
-                    style="width: 100%"
-                    size="mini"
-                    :picker-options="pickerOptions"
-                    :disabled="r.row.disabled || !r.row.isEnable"
-                    v-model="r.row.closeTime"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="下班时间" width="120" align="center">
-                <template slot-scope="r">
-                  <el-time-select
-                    style="width: 100%"
-                    size="mini"
-                    :picker-options="pickerOptions"
-                    :disabled="r.row.disabled || !r.row.isEnable"
-                    v-model="r.row.workOffTime"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作列表" width="140" align="center">
-                <template slot-scope="r">
-                  <btn-tip type="text" @click="deleteData(r.row,r.$index)">删除</btn-tip>
-                  <el-button type="text" @click="coppy(r.$index)">复制至全部</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form-item>
-        </el-form>
-<!--      </div>-->
+                <!--                  <el-radio-group-->
+                <!--                    :disabled="r.row.disabled"-->
+                <!--                    v-model="r.row.isEnable"-->
+                <!--                    @change="onEnableChange(r.row)">-->
+                <!--                    <el-radio text-color="#48bb78" :label="1">营业</el-radio>-->
+                <!--                    <el-radio text-color="#f56565" :label="0">歇业</el-radio>-->
+                <!--                  </el-radio-group>-->
+              </template>
+            </el-table-column>
+            <el-table-column label="上班时间" width="120" align="center">
+              <template slot-scope="r">
+                <el-time-select
+                  style="width: 100%"
+                  size="mini"
+                  :picker-options="pickerOptions"
+                  :disabled="r.row.disabled || !r.row.isEnable"
+                  v-model="r.row.workTime"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="营业开始" width="120" align="center">
+              <template slot-scope="r">
+                <el-time-select
+                  style="width: 100%"
+                  size="mini"
+                  :picker-options="pickerOptions"
+                  :disabled="r.row.disabled || !r.row.isEnable"
+                  v-model="r.row.openTime"
+                />
+              </template>
+            </el-table-column>
+            <!--              <el-table-column label="午休开始">-->
+            <!--                <template slot-scope="r">-->
+            <!--                  <el-time-select-->
+            <!--                    style="width: 100%"-->
+            <!--                    size="mini"-->
+            <!--                    :picker-options="pickerOptions"-->
+            <!--                    :disabled="r.row.disabled || !r.row.isEnable"-->
+            <!--                    v-model="r.row.noonbreakStart"/>-->
+            <!--                </template>-->
+            <!--              </el-table-column>-->
+            <!--              <el-table-column label="午休结束">-->
+            <!--                <template slot-scope="r">-->
+            <!--                  <el-time-select-->
+            <!--                    style="width: 100%"-->
+            <!--                    size="mini"-->
+            <!--                    :picker-options="pickerOptions"-->
+            <!--                    :disabled="r.row.disabled || !r.row.isEnable"-->
+            <!--                    v-model="r.row.noonbreakEnd"/>-->
+            <!--                </template>-->
+            <!--              </el-table-column>-->
+            <el-table-column label="营业结束" width="120" align="center">
+              <template slot-scope="r">
+                <el-time-select
+                  style="width: 100%"
+                  size="mini"
+                  :picker-options="pickerOptions"
+                  :disabled="r.row.disabled || !r.row.isEnable"
+                  v-model="r.row.closeTime"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="下班时间" width="120" align="center">
+              <template slot-scope="r">
+                <el-time-select
+                  style="width: 100%"
+                  size="mini"
+                  :picker-options="pickerOptions"
+                  :disabled="r.row.disabled || !r.row.isEnable"
+                  v-model="r.row.workOffTime"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="操作列表" width="140" align="center">
+              <template slot-scope="r">
+                <btn-tip type="text" @click="deleteData(r.row, r.$index)"
+                  >删除</btn-tip
+                >
+                <el-button type="text" @click="coppy(r.$index)"
+                  >复制至全部</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+      </el-form>
+      <!--      </div>-->
 
       <div slot="footer" class="dialog-footer">
-        <btn-tip tip="确定要提交吗?" type="primary" @click="onSubmit">保存</btn-tip>
+        <btn-tip tip="确定要提交吗?" type="primary" @click="onSubmit"
+          >保存</btn-tip
+        >
         <el-button @click="handleClose">取消</el-button>
       </div>
     </DialogCom>
   </div>
 </template>
 <script>
-
-import OrgTreeSelect from '@/components/orgTreeSelect'
+import OrgTreeSelect from "@/components/orgTreeSelect";
 import BtnTip from "@/components/btnTip";
 import dayjs from "dayjs";
-import {formatTime, timeCheck} from "@/utils/ruoyi";
-import {addWorkTimeDay} from "@/views/system/workTimeSet/api";
+import { formatTime, timeCheck } from "@/utils/ruoyi";
+import { addWorkTimeDay } from "@/views/system/workTimeSet/api";
 import day from "@/components/Crontab/day";
 
-
 export default {
-  components:{OrgTreeSelect,BtnTip},
+  components: { OrgTreeSelect, BtnTip },
   data() {
     return {
       selectTreeStrictly: true,
       isShow: false,
       workTimeList: [],
-      orgIdList:  [],
-      nodes:[],
+      orgIdList: [],
+      nodes: [],
       startDatepickerOptions: {
         disabledDate(time) {
           const date = new Date();
-          date.setTime(date.getTime()- 3600 * 1000 * 24 );
+          // date.setTime(date.getTime() - 3600 * 1000 * 24);
           return time.getTime() < date;
         },
       },
     };
   },
   props: {},
-  watch: {
-
-  },
+  watch: {},
   computed: {
     pickerOptions() {
       return {
@@ -198,41 +217,44 @@ export default {
     //   console.log(JSON.parse(nodes),'nodes')
     //   this.orgIdList = JSON.parse(nodes).map(v=>{return v.id});
     // },
-    add(){
+    add() {
       this.isShow = true;
     },
-    async refresh() {
-    },
+    async refresh() {},
     reset() {
       return {
-        workTimeList:[]
+        workTimeList: [],
       };
     },
-    addData(){
+    addData() {
       //获取workTimeList最后一条数据
       let workTime = {
         isEnable: 1,
-        workTime: '08:30',
-        openTime: '09:00',
+        workTime: "08:30",
+        openTime: "09:00",
         // noonbreakStart: '12:00',
         // noonbreakEnd: '14:00',
-        closeTime: '17:00',
-        workOffTime: '17:30',
-        isDuty:'0',
-        ymdDate: new Date(),
+        closeTime: "17:00",
+        workOffTime: "17:30",
+        isDuty: "0",
+        ymdDate: dayjs(new Date()).add(1, "day"),
         disabled: false,
       };
-      if(this.workTimeList.length>0){
-        if(this.workTimeList[this.workTimeList.length-1].ymdDate!=null){
-          workTime.ymdDate = dayjs(this.workTimeList[this.workTimeList.length-1].ymdDate).add(1,'day').toDate()
+      if (this.workTimeList.length > 0) {
+        if (this.workTimeList[this.workTimeList.length - 1].ymdDate != null) {
+          workTime.ymdDate = dayjs(
+            this.workTimeList[this.workTimeList.length - 1].ymdDate
+          )
+            .add(1, "day")
+            .toDate();
         }
       }
       this.workTimeList.push(workTime);
-      console.log("addData",this.workTimeList);
+      console.log("addData", this.workTimeList);
     },
-    coppy(index){
+    coppy(index) {
       let workTime = this.workTimeList[index];
-      for(let i=0;i<this.workTimeList.length;i++){
+      for (let i = 0; i < this.workTimeList.length; i++) {
         this.workTimeList[i].isEnable = workTime.isEnable;
         // this.workTimeList[i].workTime = workTime.workTime;
         this.workTimeList[i].openTime = workTime.openTime;
@@ -242,28 +264,28 @@ export default {
         // this.workTimeList[i].workOffTime = workTime.workOffTime;
       }
     },
-    deleteData(row,index){
+    deleteData(row, index) {
       console.log(index);
-      this.workTimeList.splice(index,1);
+      this.workTimeList.splice(index, 1);
     },
     //检查每一项
     check(other) {
-      if(!other.ymdDate){
+      if (!other.ymdDate) {
         this.$message.error(`日期不能为空`);
         return;
       }
-      const ds = this.formatTime(other.ymdDate,"YYYY-MM-DD");
-      console.log(other,'ds')
-      if ( !other.isEnable === null && !other.disabled ) {
+      const ds = this.formatTime(other.ymdDate, "YYYY-MM-DD");
+      console.log(other, "ds");
+      if (!other.isEnable === null && !other.disabled) {
         this.$message.error(`${ds}：未进行配置`);
         return;
       }
-      if(other.isEnable){
-        if(!other.openTime || !other.closeTime){
+      if (other.isEnable) {
+        if (!other.openTime || !other.closeTime) {
           this.$message.error(`${ds}：未配置时间`);
           return;
         }
-        if(!timeCheck([other.openTime,other.closeTime])){
+        if (!timeCheck([other.openTime, other.closeTime])) {
           this.$message.error(`${ds}：营业开始时间应在营业结束之前`);
           return false;
         }
@@ -271,12 +293,12 @@ export default {
       //return true
       if (other.isEnable) {
         if (
-            !(
-                other.workTime &&
-                other.openTime &&
-                other.closeTime &&
-                other.workOffTime
-            )
+          !(
+            other.workTime &&
+            other.openTime &&
+            other.closeTime &&
+            other.workOffTime
+          )
         ) {
           this.$message.error(`${ds}：有尚未配置的时间项`);
           return;
@@ -286,15 +308,15 @@ export default {
         //   return;
         // }
         if (
-            !timeCheck([
-              other.workTime,
-              other.openTime,
-              other.closeTime,
-              other.workOffTime,
-            ])
+          !timeCheck([
+            other.workTime,
+            other.openTime,
+            other.closeTime,
+            other.workOffTime,
+          ])
         ) {
           this.$message.error(
-              `${ds}：请按照（上班时间<营业时间<营业结束<下班时间）顺序配置`
+            `${ds}：请按照（上班时间<营业时间<营业结束<下班时间）顺序配置`
           );
           return false;
         }
@@ -304,8 +326,8 @@ export default {
     handleClose() {
       this.isShow = false;
       this.workTimeList = [];
-      this.orgIdList=[];
-      this.$refs['orgTreeSelect'].clear();
+      this.orgIdList = [];
+      this.$refs["orgTreeSelect"].clear();
     },
     onEnableChange(workTime) {
       if (!workTime.isEnable) {
@@ -318,16 +340,17 @@ export default {
       }
     },
     async onSubmit() {
-      if(this.orgIdList.length === 0)return  this.$message.error('请选择机构');
-      if(this.workTimeList.length === 0)return  this.$message.error('请添加日期');
+      if (this.orgIdList.length === 0) return this.$message.error("请选择机构");
+      if (this.workTimeList.length === 0)
+        return this.$message.error("请添加日期");
       //判断是否有重复的日期
       let dateList = [];
-      console.log(this.workTimeList,"this.workTimeList")
+      console.log(this.workTimeList, "this.workTimeList");
       // let workTimeList = JSON.parse(JSON.stringify(this.workTimeList))
       let workTimeList = this.workTimeList;
       for (let v of workTimeList) {
         if (v.ymdDate) {
-          let date = this.formatTime(v.ymdDate,"YYYY-MM-DD");
+          let date = this.formatTime(v.ymdDate, "YYYY-MM-DD");
           if (dateList.indexOf(date) > -1) {
             this.$message.error(`日期: ${date} 重复`);
             return;
@@ -337,21 +360,23 @@ export default {
       }
       // 校验
       for (let workTime of workTimeList) {
-        const adjustedDate = new Date(workTime.ymdDate.getTime() + 8 * 60 * 60 * 1000);
-        workTime.ymdDate=adjustedDate.toISOString().split("T")[0];
+        const adjustedDate = new Date(
+          workTime.ymdDate.getTime() + 8 * 60 * 60 * 1000
+        );
+        workTime.ymdDate = adjustedDate.toISOString().split("T")[0];
         if (!this.check(workTime)) {
           return;
         }
       }
       let data = {
-        orgIdList:this.orgIdList,
-        workTimeList:workTimeList
-      }
-      console.log(workTimeList,"workTimeList")
-      addWorkTimeDay(data).then(res=>{
+        orgIdList: this.orgIdList,
+        workTimeList: workTimeList,
+      };
+      console.log(workTimeList, "workTimeList");
+      addWorkTimeDay(data).then((res) => {
         this.$emit("ok");
         this.handleClose();
-      })
+      });
     },
   },
 };
@@ -361,7 +386,6 @@ export default {
 .question-infos {
   .el-form {
     padding-top: 10px;
-
   }
 }
 
@@ -372,5 +396,4 @@ export default {
 .change-icon {
   font-size: 18px;
 }
-
 </style>