Merge branch 'x_d_5.1' of http://120.79.166.78:19005/zhongzheng-edu/saas_masterPlatform into dev

src/views/financed/arap/dislogTip.vue

@@ -24,6 +24,11 @@
         <div>
           <el-form-item prop="noteType" label="提醒设置：">
             <el-select v-model="form.noteType" placeholder="请选择提醒类型">
+              <el-option
+                label="取消提醒"
+                v-if="orderInfo.noteId"
+                :value="0"
+              ></el-option>
               <el-option label="立即提醒" :value="1"></el-option>
               <el-option label="每天提醒" :value="2"></el-option>
               <el-option label="每周提醒" :value="3"></el-option>
@@ -60,17 +65,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <!-- <el-form-item prop="monthTime" label="" v-if="form.noteType == 4">
-            <el-date-picker
-              format="d"
-              value-format="yyyy-MM-dd"
-              v-model="value"
-              type="dates"
-              placeholder="选择日期时间"
-            >
-            </el-date-picker>
-          </el-form-item> -->
-          <el-form-item prop="dayTime" label="" v-if="form.noteType !== 1"
+          <el-form-item prop="dayTime" label="" v-if="form.noteType > 1"
             ><el-time-picker
               format="HH:mm"
               value-format="HH:mm"
@@ -168,6 +163,10 @@ export default {
           if (noteType == 4) {
             form.monthTime = monthTime.toString();
           }
+          if (noteType == 0) {
+            form.status = -1;
+            form.noteType = undefined;
+          }
           if (form.id) {
             orderNoteEdit(form).then((res) => {
               this.$message.success("催款提醒修改成功");

src/views/financed/arap/index.vue

@@ -348,8 +348,8 @@ export default {
         {
           label: "预收时间",
           hidden: true,
-          scope: "solt",
-          soltName: "predictPayTime",
+          prop: "predictReceiveTime",
+          scope: "aTimeList",
         },
         {
           label: "剩余天数",
@@ -375,6 +375,7 @@ export default {
           label: "时间",
           prop: "monthTime",
           hidden: true,
+          width: 140,
         },
         {
           label: "订单单号",
@@ -464,6 +465,7 @@ export default {
           label: "时间",
           prop: "monthTime",
           hidden: true,
+          width: 140,
         },
         {
           label: "订单单号",
@@ -552,6 +554,7 @@ export default {
           label: "时间",
           prop: "monthTime",
           hidden: true,
+          width: 140,
         },
         {
           label: "订单单号",
@@ -724,6 +727,10 @@ export default {
             e.id = e.id + 100086;
             e.billType = e.orderType + 5;
             e.monthTime = this.parseTime(e.orderTime, "{y}-{m}-{d}");
+            if (this.type == 3 || this.type == 2) {
+              e.divideCompanyMoney =
+                this.type == 2 ? e.divideSellerMoney : e.brokerage;
+            }
           });
           resolve(res.data);
         })