合并

src/utils/request.js

@@ -7,9 +7,9 @@ import { paramMate } from "@/utils/common";
 
 axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
-export const baseURL = process.env.VUE_APP_BASE_API
+// export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-// export const baseURL = "http://192.168.1.7:7077/";
+export const baseURL = "http://192.168.1.7:7077/";
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API;
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

src/views/financed/arap/index.vue

@@ -147,8 +147,7 @@
       :info="activeOrderInfo"
       @search="search"
       :dialogVisible.sync="remarkDialogVisible"
-    ></arap-remarks>
-
+    />
     <dislog-set
       :dialogVisible.sync="examineDialogVisible"
       @search="search"
@@ -285,6 +284,25 @@ export default {
       },
       // 表单
       tableSet0: [
+        {
+          label: "坏账",
+          prop: "badBill",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "否",
+              value: false,
+            },
+            {
+              label: "是",
+              value: true,
+              style: {
+                color: "red",
+              },
+            },
+          ],
+        },
         {
           label: "下单时间",
           prop: "buyTime",
@@ -580,7 +598,7 @@ export default {
       remarkDialogVisible: false,
       examineDialogVisible: false,
       badBillDialogVisible: false,
-      type: 1,
+      type: 0,
       activeOrderInfo: {},
       roleList: [],
       countInfo: {},
@@ -676,11 +694,12 @@ export default {
       ];
       fn(this.formData)
         .then((res) => {
-          res.rows.forEach((e) => {
-            e.children = [];
-            e.hasChildren = true;
-            e.monthTime = this.parseTime(e.monthTime, "{y}-{m}");
-          });
+          this.type != 0 &&
+            res.rows.forEach((e) => {
+              e.children = [];
+              e.hasChildren = true;
+              e.monthTime = this.parseTime(e.monthTime, "{y}-{m}");
+            });
           this.tableData = res.rows;
           this.total = res.total;
           this.navText.index = res.total;
@@ -802,12 +821,12 @@ export default {
       if (this.type == 0) {
         data.push(
           {
-            prop: "badStatus",
+            prop: "badBill",
             placeholder: "坏账选择",
             scope: "select",
             options: [
-              { label: "是", value: 0 },
-              { label: "否", value: 1 },
+              { label: "是", value: 1 },
+              { label: "否", value: 2 },
             ],
           },
           {

src/views/financed/components/arapRemarks.vue

@@ -54,7 +54,8 @@ export default {
       }).then((res) => {
         this.$message.success("修改备注成功");
         this.isShow = false;
-        this.$emit("search");
+        this.info.remark = this.value;
+        // this.$emit("search");
       });
     },
   },

src/views/financed/components/dislogBadBill.vue

@@ -50,7 +50,7 @@
             <div class="btns">
               <i
                 @click="add(index)"
-                v-if="!yearType.includes(1) && form.data.length < 4"
+                v-if="!yearType.includes(1) && form.data.length < 5"
                 class="el-icon-circle-plus-outline"
               ></i>
               <i
@@ -92,7 +92,8 @@ export default {
         { label: "1-2年", value: 2 },
         { label: "2-3年", value: 3 },
         { label: "3-4年", value: 4 },
-        { label: "5年以上", value: 5 },
+        { label: "4-5年", value: 5 },
+        { label: "5年以上", value: 6 },
       ],
     };
   },