add:新增线下订单需求修改

src/components/tableList.vue

@@ -1420,20 +1420,31 @@
           </div>
           <div v-else-if="item.scope === 'isOptionsDY'">
             <template v-for="(itemt, indext) in item.options">
-              <span
+              <div
                 :key="indext"
                 v-if="itemt.value === scope.row[item.prop]"
                 :style="
                   scope.row[item.prop] == 5 ? 'color:rgb(132, 0, 255);' : ''
                 "
-                >{{ itemt.label }}
+                >
+                <el-popover
+                :key="indext"
+                trigger="hover"
+                v-if="itemt.popover === true"
+              >
+                <span>订单编号（业务系统）：{{scope.row[item.oldOrder]}}</span>
+                <el-button type="text" slot="reference">{{itemt.label}}</el-button>
+              </el-popover>
+                <span v-else>{{ itemt.label }}
                 <el-button
                   type="text"
                   v-if="itemt.click"
                   @click="backFunc(scope.row)"
                   >查看</el-button
-                ></span
+                ></span>
+                </div
               >
+              
             </template>
           </div>
           <div v-else-if="item.scope === 'orderGoodsStatus'">

src/views/Marketing/order/offlineOrder/index.vue

@@ -24,8 +24,12 @@
         <el-button type="text" @click="theOrderJump(props.scope.row, 1)"
           >订单详情</el-button
         >
-        <el-button type="text" @click="theOrderJump(props.scope.row, 2)"
-        :disabled="props.scope.row.orderFrom == 5 || props.scope.row.orderFrom == 6"
+        <el-button
+          type="text"
+          @click="theOrderJump(props.scope.row, 2)"
+          :disabled="
+            props.scope.row.orderFrom == 5 || props.scope.row.orderFrom == 6
+          "
           >计费单收费</el-button
         >
         <el-button type="text" @click="theOrderJump(props.scope.row, 3)"
@@ -91,6 +95,25 @@ export default {
           prop: "searchKey",
           placeholder: "请输入订单编码/录单人姓名",
         },
+        {
+          prop: "orderFrom",
+          placeholder: "订单来源",
+          scope: "select",
+          options: [
+            {
+              label: "系统录单",
+              value: "5",
+            },
+            {
+              label: "业务系统",
+              value: "6",
+            },
+          ],
+        },
+        {
+          prop: "oldOrderSn",
+          placeholder: "订单编号（业务系统）",
+        },
       ],
       formData: {
         status: 1,
@@ -165,6 +188,7 @@ export default {
         {
           label: "订单来源",
           prop: "orderFrom",
+          oldOrder:"oldOrderSn",
           hidden: true,
           scope: "isOptionsDY",
           width: "130px",
@@ -186,12 +210,13 @@ export default {
               value: "4",
             },
             {
-              label: "业务员录单",
+              label: "系统录单",
               value: "5",
             },
             {
               label: "业务系统",
               value: "6",
+              popover: true,
             },
           ],
         },
@@ -318,7 +343,7 @@ export default {
             path: "orderDetailsT",
             query: {
               inputOrderSn: row.inputOrderSn,
-              orderFrom:row.orderFrom,
+              orderFrom: row.orderFrom,
             },
           });
         };

src/views/education/notificationManageMent/notificationModel/index.vue

@@ -21,6 +21,9 @@
               v-model="scope.row[item.prop]"
               @change="changeCheck(scope.row, item.prop)"
             ></el-checkbox>
+            <span v-else-if="item.scope === 'isOptions'">
+              {{scope.row[item.prop] == 1 ? '学员':scope.row[item.prop] == 2 ? '教务':''}}
+            </span>
             <span v-else-if="item.scope === 'busins'">
               <span v-if="scope.row[item.prop] === 1">全部</span
               ><el-button v-else type="text" @click="openBox(scope.row)"
@@ -83,7 +86,7 @@
 <script>
 import pagination from "@/components/pagination";
 export default {
-  name:"NotificationModel",
+  name: "NotificationModel",
   components: { pagination },
   data() {
     return {
@@ -99,7 +102,13 @@ export default {
           width: "80px",
         },
         {
-          label: "提醒项（学员）",
+          label: "通知用户",
+          width: "100px",
+          prop: "userType",
+          scope: "isOptions",
+        },
+        {
+          label: "提醒项",
           prop: "remind",
         },
         {
@@ -160,11 +169,14 @@ export default {
       if (value === "gzhTpStatus") {
         data.gzhTpStatus = item.gzhTpStatus;
       }
-      this.$api.editsystemremind(data).then((res) => {
-        this.$message.success("更新成功");
-      }).finally(()=>{
-        this.search()
-      })
+      this.$api
+        .editsystemremind(data)
+        .then((res) => {
+          this.$message.success("更新成功");
+        })
+        .finally(() => {
+          this.search();
+        });
     },
     submitChecks() {
       var data = {
@@ -281,7 +293,7 @@ export default {
       }
     }
   }
-  .el-dialog__body{
+  .el-dialog__body {
     max-height: 500px;
     overflow: auto;
   }