fix:修改报考学员接口，add:订单字段紫色突显

src/components/tableList.vue

@@ -974,6 +974,15 @@
                 : ""
             }}
           </span>
+          <div
+            v-else-if="item.scope === 'RealPrice'"
+            :style="scope.row[item.prop2] != null ? 'color:rgb(132, 0, 255);' : ''"
+          >
+            ￥{{ scope.row[item.prop1] }}
+            <span v-if="scope.row[item.prop2] != null">
+              (实收￥{{ scope.row[item.prop2] }})</span
+            >
+          </div>
           <span
             v-else-if="item.scope === 'statusPeriod'"
             :style="scope.row[item.prop] === 2 ? 'color:red' : ''"
@@ -1398,6 +1407,24 @@
               >
             </template>
           </div>
+          <div v-else-if="item.scope === 'isOptionsDY'">
+            <template v-for="(itemt, indext) in item.options">
+              <span
+                :key="indext"
+                v-if="itemt.value === scope.row[item.prop]"
+                :style="
+                  scope.row[item.prop] == 5 ? 'color:rgb(132, 0, 255);' : ''
+                "
+                >{{ itemt.label }}
+                <el-button
+                  type="text"
+                  v-if="itemt.click"
+                  @click="backFunc(scope.row)"
+                  >查看</el-button
+                ></span
+              >
+            </template>
+          </div>
           <div v-else-if="item.scope === 'orderGoodsStatus'">
             {{
               scope.row[item.prop] === -1

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

@@ -25,6 +25,7 @@
           >订单详情</el-button
         >
         <el-button type="text" @click="theOrderJump(props.scope.row, 2)"
+        :disabled="props.scope.row.orderFrom == 5"
           >计费单收费</el-button
         >
         <el-button type="text" @click="theOrderJump(props.scope.row, 3)"
@@ -142,10 +143,10 @@ export default {
         },
         {
           label: "已收总金额",
-          prop: "goodsReceived",
+          prop1: "goodsReceived",
+          prop2: "goodsRealPrice",
           hidden: true,
-          scope: "leftCh",
-          ch: "￥",
+          scope: "RealPrice",
         },
         {
           label: "已退总金额",
@@ -161,6 +162,35 @@ export default {
           hidden: true,
           scope: "outStandingAmount",
         },
+        {
+          label: "订单来源",
+          prop: "orderFrom",
+          hidden: true,
+          scope: "isOptionsDY",
+          width: "130px",
+          options: [
+            {
+              label: "业务员普通单",
+              value: "1",
+            },
+            {
+              label: "祥粤云学堂小程序",
+              value: "2",
+            },
+            {
+              label: "祥粤云学堂网站",
+              value: "3",
+            },
+            {
+              label: "祥粤e管证小程序",
+              value: "4",
+            },
+            {
+              label: "业务员录单",
+              value: "5",
+            },
+          ],
+        },
         {
           label: "录单人",
           prop: "createUsername",

src/views/Marketing/order/offlineOrder/orderChargeInfo/goodsDocument/costPrice.vue

@@ -91,6 +91,7 @@
           <el-col :span="12">
             <el-form-item label="付款时间">
               <el-input
+                class="inputStyle"
                 disabled
                 :value="$methodsTools.onlyForma(listData.payTime)"
               ></el-input>
@@ -130,6 +131,7 @@
           <el-col :span="12">
             <el-form-item label="收款时间">
               <el-input
+                class="inputStyle"
                 disabled
                 :value="$methodsTools.onlyForma(listData.collectionTime)"
               ></el-input>
@@ -170,7 +172,11 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="收费金额" prop="amount">
-              <el-input disabled v-model="costList.amount"></el-input>
+              <el-input
+                class="inputStyle"
+                disabled
+                v-model="costList.amount"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -326,4 +332,7 @@ export default {
   color: #666;
   margin-bottom: 10px;
 }
+/deep/ .inputStyle > .el-input__inner {
+  color: rgb(132, 0, 255);
+}
 </style>

src/views/Marketing/order/offlineOrder/orderChargeInfo/goodsDocument/goodsInfos.vue

@@ -59,6 +59,7 @@
                 :size="size"
                 :disabled="item.disabled ? false : true"
                 v-else
+                :class="item.color ? 'inputStyle' : ''"
                 v-model="listData[item.prop]"
               ></el-input>
             </template>
@@ -196,6 +197,7 @@
             </el-select>
             <el-input
               :size="size"
+              :class="item.color ? 'inputStyle' : ''"
               :disabled="item.noDisabled ? false : true"
               v-else
               v-model="listData[item.prop]"
@@ -327,12 +329,19 @@ export default {
           label: "支付金额",
           prop: "goodsReceived",
           dataType: "listData",
+          color: true,
         },
         {
           label: "商品类型",
           prop: "goodsType",
           scope: "select",
         },
+        {
+          label: "实收金额",
+          prop: "goodsRealPrice",
+          dataType: "listData",
+          color: true,
+        },
         {
           label: "支付状态",
           prop: "payStatus",
@@ -347,6 +356,11 @@ export default {
           label: "商品名称",
           prop: "goodsName",
         },
+        {
+          label: "商品标准价格明细",
+          prop: "payer",
+          scope: "table",
+        },
         {
           label: "业务层级",
           prop1: "educationName",
@@ -354,11 +368,6 @@ export default {
           prop3: "businessName",
           scope: "yecj",
         },
-        {
-          label: "商品标准价格明细",
-          prop: "payer",
-          scope: "table",
-        },
         {
           label: "商品有效期",
           prop: "validity",
@@ -400,6 +409,7 @@ export default {
         {
           label: "录单人",
           prop: "createBy",
+          color: true,
         },
       ],
       copyStatus: "", //拷贝订单状态
@@ -501,4 +511,7 @@ export default {
 /deep/ .el-input__inner {
   width: 350px;
 }
+/deep/ .inputStyle > .el-input__inner {
+  color: rgb(132, 0, 255);
+}
 </style>

src/views/Marketing/order/offlineOrder/orderChargeInfo/topBox.vue

@@ -9,6 +9,7 @@
             size="mini"
           >
             <el-input
+              :class="item.color ? 'inputStyle' : ''"
               readonly
               :value="(formData[item.prop1] - formData[item.prop2]).toFixed(2)"
             ></el-input>
@@ -29,6 +30,22 @@
               "
             ></el-input>
           </el-form-item>
+          <el-row v-else-if="item.scope === 'span'">
+            <el-col :span="15">
+              <el-form-item :label="item.label1" size="mini">
+                <el-input
+                  readonly
+                  :value="formData[item.prop1]"
+                ></el-input></el-form-item
+            ></el-col>
+            <el-col :span="9"
+              ><el-form-item  label-width="90px" :label="item.label2" size="mini">
+                <el-input
+                  readonly
+                  :value="formData[item.prop2]"
+                ></el-input> </el-form-item
+            ></el-col>
+          </el-row>
           <el-form-item
             v-else-if="item.scope === 'time'"
             :label="item.label"
@@ -58,7 +75,11 @@
             ><span style="margin: 0px 6px">商品</span>
           </el-form-item>
           <el-form-item v-else :label="item.label" size="mini">
-            <el-input readonly :value="formData[item.prop]"></el-input>
+            <el-input
+              :class="item.color ? 'inputStyle' : ''"
+              readonly
+              :value="formData[item.prop]"
+            ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,8 +104,12 @@ export default {
           scope: "busin",
         },
         {
-          label: "已收金额：",
-          prop: "goodsReceived",
+          label1: "已收金额：",
+          label2: "实收金额：",
+          prop1: "goodsReceived",
+          prop2: "goodsRealPrice",
+          color: true,
+          scope: "span",
         },
         {
           label: "订单时间：",
@@ -98,6 +123,7 @@ export default {
         {
           label: "已退金额：",
           prop: "goodsRefund",
+          color: true,
         },
         {
           label: "录单人：",
@@ -112,6 +138,7 @@ export default {
           prop1: "payPrice",
           prop2: "goodsReceived",
           scope: "comput",
+          color: true,
         },
         {
           label: "下单结果：",
@@ -147,4 +174,7 @@ export default {
 #topBox {
   flex-shrink: 0;
 }
+/deep/ .inputStyle > .el-input__inner {
+  color: rgb(132, 0, 255);
+}
 </style>

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

@@ -259,10 +259,10 @@ export default {
         },
         {
           label: "已收金额",
-          prop: "goodsReceived",
+          prop1: "goodsReceived",
+          prop2: "goodsRealPrice",
           hidden: true,
-          scope: "leftCh",
-          ch: "￥",
+          scope: "RealPrice",
         },
         {
           label: "未收金额",

src/views/education/classManageMent/classHoursReview/index.vue

@@ -83,4 +83,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/ .el-tabs__content{
+  padding: 6px;
+}
 </style>

src/views/education/classManageMent/learningHoursRecordList/studyTimesRecord.vue

@@ -29,70 +29,66 @@
         @click="showBox = !showBox"
         >{{ showBox ? "收起" : "展开" }}</el-button
       >
-      <div style="clear:both;"></div>
+      <div style="clear: both"></div>
     </div>
-      <div class="dis_fs" :style="showBox ? '' : 'height:0px;'">
-        <ul class="ul_ls">
-          <li>学员编码：{{ userData.studentCode }}</li>
-          <li>学员姓名：{{ userData.realName }}</li>
-          <li>学员身份证号码：{{ userData.idCard }}</li>
-          <li>绑定手机号码：{{ userData.telPhone }}</li>
-        </ul>
-        <div class="photoSty1">
-          <img
-            style="width: 100%; height: 100%"
-            v-if="!userData.oneInchPhotos"
-            src="@/assets/404_images/wuyuxaog.png"
-            alt=""
-          />
-          <el-image
-            v-else
-            style="width: 100%; height: 100%"
-            :src="$methodsTools.splitImgHost(userData.oneInchPhotos)"
-            :preview-src-list="[
-              $methodsTools.splitImgHost(userData.oneInchPhotos),
-            ]"
-          >
-          </el-image>
-          <div class="pos_bottom">一寸头像图</div>
-        </div>
-        <div class="photoSty2">
-          <img
-            style="width: 100%; height: 100%"
-            v-if="!userData.idCardImg1"
-            src="@/assets/404_images/wuyuxaog.png"
-            alt=""
-          />
-          <el-image
-            v-else
-            style="width: 100%; height: 100%"
-            :src="$methodsTools.splitImgHost(userData.idCardImg1)"
-            :preview-src-list="[
-              $methodsTools.splitImgHost(userData.idCardImg1),
-            ]"
-          >
-          </el-image>
-          <div class="pos_bottom">身份证头像照</div>
-        </div>
-        <div class="photoSty2" style="margin-right: 0px">
-          <img
-            style="width: 100%; height: 100%"
-            v-if="!userData.idCardImg2"
-            src="@/assets/404_images/wuyuxaog.png"
-            alt=""
-          />
-          <el-image
-            v-else
-            style="width: 100%; height: 100%"
-            :src="$methodsTools.splitImgHost(userData.idCardImg2)"
-            :preview-src-list="[
-              $methodsTools.splitImgHost(userData.idCardImg2),
-            ]"
-          >
-          </el-image>
-          <div class="pos_bottom">身份证国徽照</div>
-        </div>
+    <div class="dis_fs" :style="showBox ? '' : 'height:0px;'">
+      <ul class="ul_ls">
+        <li>学员编码：{{ userData.studentCode }}</li>
+        <li>学员姓名：{{ userData.realName }}</li>
+        <li>学员身份证号码：{{ userData.idCard }}</li>
+        <li>绑定手机号码：{{ userData.telPhone }}</li>
+      </ul>
+      <div class="photoSty1">
+        <img
+          style="width: 100%; height: 100%"
+          v-if="!userData.oneInchPhotos"
+          src="@/assets/404_images/wuyuxaog.png"
+          alt=""
+        />
+        <el-image
+          v-else
+          style="width: 100%; height: 100%"
+          :src="$methodsTools.splitImgHost(userData.oneInchPhotos)"
+          :preview-src-list="[
+            $methodsTools.splitImgHost(userData.oneInchPhotos),
+          ]"
+        >
+        </el-image>
+        <div class="pos_bottom">一寸头像图</div>
       </div>
+      <div class="photoSty2">
+        <img
+          style="width: 100%; height: 100%"
+          v-if="!userData.idCardImg1"
+          src="@/assets/404_images/wuyuxaog.png"
+          alt=""
+        />
+        <el-image
+          v-else
+          style="width: 100%; height: 100%"
+          :src="$methodsTools.splitImgHost(userData.idCardImg1)"
+          :preview-src-list="[$methodsTools.splitImgHost(userData.idCardImg1)]"
+        >
+        </el-image>
+        <div class="pos_bottom">身份证头像照</div>
+      </div>
+      <div class="photoSty2" style="margin-right: 0px">
+        <img
+          style="width: 100%; height: 100%"
+          v-if="!userData.idCardImg2"
+          src="@/assets/404_images/wuyuxaog.png"
+          alt=""
+        />
+        <el-image
+          v-else
+          style="width: 100%; height: 100%"
+          :src="$methodsTools.splitImgHost(userData.idCardImg2)"
+          :preview-src-list="[$methodsTools.splitImgHost(userData.idCardImg2)]"
+        >
+        </el-image>
+        <div class="pos_bottom">身份证国徽照</div>
+      </div>
+    </div>
 
     <div class="dis_fls">
       <div class="s_sd">