Merge branch 'feature/jq' into 'develop'

添加返回

See merge request !156

src/components/list/table-serviceSchedule.vue

@@ -30,7 +30,9 @@
         :filter-method="getServiceOpen"
       >
         <template slot-scope="scope">
-          <span style="margin-left: 10px">{{ scope.row.serviceOpen ==='1' ? '开通': '未开通' }}</span>
+          <span style="margin-left: 10px">{{
+            scope.row.serviceOpen === '1' ? '开通' : '未开通'
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -67,7 +69,9 @@
         :filter-method="getWorkStatus"
       >
         <template slot-scope="scope">
-          <span style="margin-left: 10px">{{ scope.row.workStatus ==='2' ? '未排班': '已排班' }}</span>
+          <span style="margin-left: 10px">{{
+            scope.row.workStatus === '2' ? '未排班' : '已排班'
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -84,15 +88,15 @@
         align="center"
       />
       <el-table-column
-        property="delivery"
+        prop="switchStatus"
         align="center"
         label="接单开关"
       >
         <template slot-scope="scope">
           <el-switch
-            v-model="scope.row.delivery"
+            v-model="scope.row.switchStatus"
             active-color="#0D9078"
-            @change="changeSwitch(scope.$index,scope.row)"
+            @change="changeSwitch(scope.$index, scope.row)"
           />
         </template>
       </el-table-column>
@@ -105,25 +109,25 @@
         <template slot-scope="scope">
           <div
             class="scope-work"
-            style="display:flex"
+            style="display: flex"
           >
             <div
-              v-if=" scope.row.workStatus === '2'"
+              v-if="scope.row.workStatus === '2'"
               class="download-btn"
-              @click="addSchedule(scope.row,1)"
+              @click="addSchedule(scope.row, 1)"
             >
               新增排班
             </div>
             <div
               v-else
               class="download-btn"
-              @click="addSchedule(scope.row,2)"
+              @click="addSchedule(scope.row, 2)"
             >
               编辑排班
             </div>
             <div
               class="download-btn"
-              @click="addSchedule(scope.row,2)"
+              @click="addSchedule(scope.row, 2)"
             >
               查看
             </div>
@@ -150,7 +154,7 @@
 <script>
   export default {
     components: {
-      // NewScheduling,
+    // NewScheduling,
     },
     props: {
       tableData: {
@@ -184,32 +188,32 @@
     },
     data() {
       return {
-        workStatusList:[
+        workStatusList: [
           {
             text: '已排班',
-            value: '已排班' 
-          }, 
-          { 
-            text: '未排班', 
-            value: '未排班' 
-          }
+            value: '已排班',
+          },
+          {
+            text: '未排班',
+            value: '未排班',
+          },
         ],
-        serviceOpenList:[
-          { 
-            value: 1, 
-            text: '开通'
+        serviceOpenList: [
+          {
+            value: 1,
+            text: '开通',
           },
-          { 
-            value: 2, 
-            text: '未开通'
+          {
+            value: 2,
+            text: '未开通',
           },
         ],
       };
     },
+    computed: {},
     mounted() {},
-    methods:{
+    methods: {
       changeSwitch(value, val) {
-        console.log(value, val, '123');
         this.$emit('changeSwitch', value, val);
       },
       // handleFilterChange(value) {
@@ -222,22 +226,18 @@
         return row.level === String(value);
       },
       getWorkStatus(value, row) {
-        console.log(value, row);
         let newValue = '';
         if (value === '未排班') {
           newValue = '2';
-        }else{
+        } else {
           newValue = '1';
         }
         return row.workStatus === String(newValue);
       },
       showworkStatus() {
-        console.log(11111);
         this.isworkStatus = !this.isworkStatus;
-        console.log(this.isworkStatus);
       },
       addSchedule(value, val) {
-        console.log(value, val, '123212321');
         this.$emit('addSchedule', value, val);
       },
       // 分页
@@ -250,27 +250,27 @@
       sortfunc(data) {
         this.$emit('sortfunc', data);
       },
-    }
+    },
   };
 </script>
 
 <style lang="scss" scoped>
-    .table-serviceSchedule{
-        .el-table {
-          border-radius: 8px;
+.table-serviceSchedule {
+  .el-table {
+    border-radius: 8px;
     // 深度选择器
-    /deep/ .highlight{
-      color: #0D9078 !important;
+    /deep/ .highlight {
+      color: #0d9078 !important;
     }
-    .scope-work{
+    .scope-work {
       display: flex;
       justify-content: center;
-      .download-btn{
-      color: #0D9078;
-      cursor: pointer;
-      margin-right: 10px;
-    }
+      .download-btn {
+        color: #0d9078;
+        cursor: pointer;
+        margin-right: 10px;
+      }
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

src/views/IM/diagnosis-admin/modal/newScheduling.vue

 <template>
-  <div>新增排班</div>
+  <div>
+    <span>{{ schedulingTypeValue }}</span>
+    <span>{{ schedulingType }}</span>
+  </div>
 </template>
 
 <script>
-  export default {};
+  export default {
+    props: {
+      schedulingTypeValue: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      schedulingType: {
+        type: String,
+        default: '',
+      },
+    },
+    data() {
+      return {};
+    },
+    watch: {},
+    created() {
+      console.log(this.schedulingTypeValue, this.schedulingType);
+    },
+    methods: {},
+  };
 </script>
 
 <style></style>