Merge branch 'main' of http://42.192.7.176:3000/suojin/physical_examination_front into main

src/views/booknumber/index.vue

@@ -19,7 +19,7 @@
         <span v-text='row.createDeptName'></span>
       </template>
       <template slot-scope="{row}" slot="menu">
-        <el-button type="text"  @click="handleRegister(row)">修改</el-button>
+        <el-button type="text"  @click="handleRegister(row)" :disabled="Date.parse(new Date(row.apmDay)) <= selectDay ? true : false">修改</el-button>
       </template>
       <template slot-scope="scope" slot="menuLeft">
       <el-button  type="primary"
@@ -237,8 +237,10 @@ export default {
   mounted() {
     if(this.userInfo.role_name !== 'hospital'){
       // this.isShowHos = true
+      this.selectDay = new Date().getTime();
       this.option.column.find(item => item.prop == "hosId").search = true
     }else{
+      this.selectDay = new Date().getTime() + 3600 * 1000 * 24 * 6
       // this.isShowHos = false
       this.option.column.find(item => item.prop == "hosId").search = false
     }
@@ -396,7 +398,9 @@ export default {
       this.activeName = this.tabArr[0].dictValue;
       this.isNumber = true;
       this.isShow = true;
-      this.deptName = ''
+      this.isEdit = false
+      this.deptName = '';
+
       this.tabArr = this.tabArr1
       this.tabArr.map(item =>{
         item.addForm={
@@ -446,7 +450,8 @@ export default {
         // })
         
       }else{
-          this.selectDay = new Date().getTime() + 3600 * 1000 * 24 * 7;
+          this.selectDay = new Date().getTime() + 3600 * 1000 * 24 * 6;
+          // console.log(new Date(this.selectDay))
           this.isShowHos = false
           // this.tabArr.map(item =>{
           //   // item.addOption.column.find(item1 => item1.prop == "select").display = false
@@ -465,6 +470,7 @@ export default {
           project:row.project,
           apmDay:row.apmDay.substr(0,10)
       }
+      this.dayArr = []
       this.dayArr.push(row.apmDay.substr(0,10))
       examProjectDetail(values).then(res =>{
         let data = res.data.data;
@@ -480,7 +486,7 @@ export default {
               this.selectDay = new Date().getTime();
             }else{
               this.isShowHos = false
-              this.selectDay = new Date().getTime() + 3600 * 1000 * 24 * 7;
+              this.selectDay = new Date().getTime() + 3600 * 1000 * 24 * 6;
               // item.addOption.column.find(item => item.prop == "select").display = false
             }
             if(item.dictValue == this.activeName){
@@ -629,13 +635,14 @@ export default {
             type: 'warning',
             customClass:'dialog_box'
           }).then(() => {
-            this.isShow = false;
+            this.isShow = true;
             this.title = '放号日期';
             this.subtitle = '请选择配置号源投放的具体日期。'
-
+            this.clickSubmit()
-            done()
+            // done()
-          }).catch(() => {         
+          }).catch((err) => {   
-            done()
+            console.log(err)      
+            // done()
           });
         }else{
           this.dayArr = []
@@ -727,7 +734,7 @@ export default {
         configListVOS = configListVOS.filter(item => item.detailList.length !== 0);
         values.configListVOS = configListVOS
       }
-      // console.log(values)
+      console.log(values)
       addExamProject(values).then(res =>{
         console.log(res)
        if(res.data.code == 200){