修改bug

src/utils/request.js

@@ -18,7 +18,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.NODE_ENV === 'development'? '/dev-api' : process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 15000
+  timeout: 65000
 })
 
 // request拦截器

src/views/core/edu/task/dialog.newTask.vue

@@ -182,7 +182,7 @@ export default {
         trainingStartDateTime: [{required: true, message: "请选择培训开始时间"}],
         trainingEndDateTime: [{required: true, message: "请选择培训结束时间"}],
         note: [{required: true, message: "请输入培训总结"}],
-       /* site: [{required: true, message: "请输入地点"}],*/
+        site: [{required: true, message: "请输入地点"}],
         imageList: [{required: true, message: "请上传培训图片"}],
         // fileList: [{required: true, message: "请上传培训文件"}],
       },

src/views/core/edu/task/dialog.perform.vue

@@ -175,6 +175,7 @@ export default {
         absenceList: [{required: true, type: "array", message: "请选择参会人员"}],
         trainingStartDateTime: [{required: true, message: "请输入培训开始时间"}],
         trainingEndDateTime: [{required: true, message: "请输入培训结束时间"}],
+        site: [{required: true, message: "请输入地点"}],
         note: [{required: true, message: "请输入培训总结"}],
         imageList: [{required: true, message: "请上传培训图片"}],
       },

src/views/core/reportForms/selfInspectReport.vue

@@ -162,7 +162,7 @@ export default {
         orgId: null,
         year: new Date(),
         cycle: 1,
-        date:[new Date(),new Date()]
+        date:[this.formatDate(new Date()),this.formatDate(new Date())]
       },
       // 表单参数
       form: {},
@@ -203,6 +203,12 @@ export default {
     ...mapGetters(["orgId"]),
   },
   methods: {
+    formatDate(date) {
+      const year = date.getFullYear();
+      const month = (date.getMonth() + 1).toString().padStart(2, '0');
+      const day = date.getDate().toString().padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
     getDefaultOrg(node) {
       this.queryParams.orgId = node.id;
       this.selectedOrgName = node.shortName;

src/views/safetycheck/task/components/checkRegister.vue

@@ -314,7 +314,7 @@ export default {
     onCheckOrgSelect(node) {
       if (node == null) {
         this.prevCheckOrgType = null;
-        this.roleOptions = [];
+        /*this.roleOptions = [];*/
         this.checkRoleId = null;
         return;
       }

src/views/system/dept/extend.vue

@@ -154,6 +154,18 @@
                 placeholder="请选择气象行政区域"
               ></el-cascader>
             </el-descriptions-item>
+            <el-descriptions-item v-if="type === org_type.hangse" labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle' label="是否独立机构">
+              <el-radio-group v-model="aloneDept">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="`${dict.value}`"
+                  :label="dict.value"
+
+                >{{ dict.label }}</el-radio
+                >
+              </el-radio-group>
+            </el-descriptions-item>
+
             <el-descriptions-item v-if="type === org_type.yewd" labelClassName="info_label_required" label="产权类型" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-select
                 clearable
@@ -598,6 +610,7 @@ export default {
     "org_extend_detached_standard",
     "org_extend_is",
     "property_situation",
+    'sys_yes_no',
 
   ],
 
@@ -635,6 +648,7 @@ export default {
         yewd: '4',
         lhzz: '5',
         zxywk: '6',
+        hangse: '3',
       },
       reqmsg: false,
       imageViewer: false,
@@ -681,6 +695,7 @@ export default {
       weatherAreaCode: null,
       premisesArea: null,
       ownership: null,
+      aloneDept:null,
       outsideArea: null,
       askari: null,
       businessLibrary: null,
@@ -1074,6 +1089,7 @@ export default {
             this.isAskariCertificate=0;
           }
           this.extendId = data.data.id;
+          this.aloneDept = data.data.aloneDept;
           this.constructionTime = data.data.constructionTime;
           this.lastUpdateTime = data.data.lastUpdateTime;
           this.platformBrand = data.data.platformBrand;
@@ -1619,6 +1635,8 @@ export default {
         cashAddingRoomRemoteControl: this.cashAddingRoomRemoteControl,
         hdCameraCount: this.hdCameraCount,
         totalCameraCount: this.totalCameraCount,
+        aloneDept: this.aloneDept,
+
       };
       // console.log(dat);
       if (this.extendId) {
@@ -1640,6 +1658,11 @@ export default {
         this.$modal.msgError("气象行政区域不能为空，请选择气象行政区域");
         return false;
       }
+      if(this.type === this.org_type.hangse && this.aloneDept == null){
+        this.$modal.msgError("是否独立部门不能为空，请选择是否独立部门");
+        return false;
+      }
+
       if (this.type === this.org_type.yewd && this.ownership == null) {
         this.$modal.msgError("产权类型不能为空，请选择产权类型");
         return false;

src/views/system/user/extend.vue

@@ -36,17 +36,6 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item v-if ="formData.duties==1" label="是否独立机构" prop="aloneDept">
-                <el-radio-group v-model="formData.aloneDept">
-                  <el-radio
-                    v-for="dict in dict.type.sys_yes_no"
-                    :key="`${dict.value}`"
-                    :label="dict.value"
-
-                  >{{ dict.label }}</el-radio
-                  >
-                </el-radio-group>
-              </el-form-item>
 
             </el-col>
             <el-col :xs="24" :sm="12" :md="8" :lg="6">

src/views/system/user/index.vue

@@ -557,7 +557,6 @@
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="`${dict.value}`"
                   :label="dict.value"
-                  :disabled="form.source == 1"
                 >{{ dict.label }}
                 </el-radio
                 >

src/views/system/workTimeSet/json.js

@@ -71,7 +71,7 @@ export let json = [
   },
   {
     "id": null,
-    "isDuty": '1',
+    "isDuty": '0',
     "workTimeSetId": null,
     "isWorkday": '0',
     "dayOfWeek": 7,
@@ -85,7 +85,7 @@ export let json = [
   },
   {
     "id": null,
-    "isDuty": '1',
+    "isDuty": '0',
     "workTimeSetId": null,
     "isWorkday": '0',
     "dayOfWeek": 1,